glamor: replace XNFasprintf() by asprintf()

Just use standard libc functions instead of own (incomplete)
implementations.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

Author: metux

glamor/glamor_gradient.c

@@ -169,8 +169,11 @@ _glamor_create_getcolor_fs_source(ScreenPtr screen, int stops_count,
         "}\n";
 
     if (use_array) {
-        XNFasprintf(&gradient_fs,
-                    gradient_fs_getcolor, stops_count, stops_count);
+        if (asprintf(&gradient_fs,
+                     gradient_fs_getcolor, stops_count, stops_count) == -1) {
+            ErrorF("Failed to allocate gradient_fs memory.\n");
+            return NULL;
+        }
         return gradient_fs;
     }
     else {
@@ -335,11 +338,12 @@ _glamor_create_radial_gradient_program(ScreenPtr screen, int stops_count,
         _glamor_create_getcolor_fs_source(screen, stops_count,
                                           (stops_count > 0));
 
-    XNFasprintf(&gradient_fs,
+    if (asprintf(&gradient_fs,
                 gradient_radial_fs_template,
                 PIXMAN_REPEAT_NONE, PIXMAN_REPEAT_NORMAL,
                 PIXMAN_REPEAT_REFLECT,
-                fs_getcolor_source);
+                fs_getcolor_source) == -1)
+        return FALSE;
 
     fs_prog = glamor_compile_glsl_prog(GL_FRAGMENT_SHADER, gradient_fs);
 
@@ -522,10 +526,11 @@ _glamor_create_linear_gradient_program(ScreenPtr screen, int stops_count,
     fs_getcolor_source =
         _glamor_create_getcolor_fs_source(screen, stops_count, stops_count > 0);
 
-    XNFasprintf(&gradient_fs,
+    if (asprintf(&gradient_fs,
                 gradient_fs_template,
                 PIXMAN_REPEAT_NORMAL, PIXMAN_REPEAT_REFLECT,
-                fs_getcolor_source);
+                fs_getcolor_source) == -1)
+        return FALSE;
 
     fs_prog = glamor_compile_glsl_prog(GL_FRAGMENT_SHADER, gradient_fs);
     free(gradient_fs);

glamor/glamor_render.c

@@ -335,13 +335,14 @@ glamor_create_composite_fs(glamor_screen_private *glamor_priv, struct shader_key
         FatalError("Bad composite IN type");
     }
 
-    XNFasprintf(&source,
+    if (asprintf(&source,
                 "%s"
                 GLAMOR_DEFAULT_PRECISION
                 "%s%s%s%s%s%s%s%s", header, GLAMOR_COMPAT_DEFINES_FS,
                 repeat_define, relocate_texture,
                 enable_rel_sampler ? rel_sampler : stub_rel_sampler,
-                source_fetch, mask_fetch, dest_swizzle, in);
+                source_fetch, mask_fetch, dest_swizzle, in) == -1)
+        FatalError("Memory allocation on asprintf() failed\n");
 
     prog = glamor_compile_glsl_prog(GL_FRAGMENT_SHADER, source);
     free(source);
@@ -385,12 +386,13 @@ glamor_create_composite_vs(glamor_screen_private* priv, struct shader_key *key)
     if (priv->is_gles && priv->glsl_version > 120)
         version = version_gles3;
 
-    XNFasprintf(&source,
+    if (asprintf(&source,
                 "%s"
                 GLAMOR_DEFAULT_PRECISION
                 "%s%s%s%s%s",
                 version, defines, main_opening, source_coords_setup,
-                mask_coords_setup, main_closing);
+                mask_coords_setup, main_closing) == -1)
+        FatalError("malloc on asprintf() failed\n");
 
     prog = glamor_compile_glsl_prog(GL_VERTEX_SHADER, source);
     free(source);