--- a/tools/gfxconv.c	Fri May 16 20:08:39 2014 +0300
+++ b/tools/gfxconv.c	Fri May 16 20:09:45 2014 +0300
@@ -1051,31 +1051,24 @@
         case IMGFMT_ARAW:
             {
                 FILE *fp;
-                char *dataFilename, *fext, *tmpFilename = dm_strdup(filename);
+                char *dataFilename;
                 
                 // Form data file filename
-                if (tmpFilename == NULL)
+                dataFilename = dm_strdup_fext(filename, "%s.inc");
+                if (dataFilename == NULL)
                     return DMERR_MALLOC;
 
-                fext = strrchr(tmpFilename, '.');
-                if (fext != NULL)
-                    *fext = 0;
-                dataFilename = dm_strdup_printf("%s.inc", tmpFilename);
-                dmFree(tmpFilename);
-
                 // Open data file for writing
                 if ((fp = fopen(dataFilename, "w")) == NULL)
                     dmError("Could not create '%s'.\n", dataFilename);
+
                 dmFree(dataFilename);
 
                 if (fp != NULL)
                 {
                     // Strip extension
                     int i;
-                    char *palID = dm_strdup_printf("img_%s", filename);
-                    char *fext = strrchr(palID, '.');
-                    if (fext != NULL)
-                        *fext = 0;
+                    char *palID = dm_strdup_fext(filename, "img_%s");
 
                     // Replace any non-alphanumerics
                     for (i = 0; palID[i]; i++)