Mercurial > hg > dmlib

comparison tools/gfxconv.c @ 820:e3fa646aef0d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use dm_strdup_fext().
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 16 May 2014 20:09:45 +0300
parents 0177d4a66d48
children 8ec16cca0eef
comparison
equal deleted inserted replaced
819:0177d4a66d48 820:e3fa646aef0d
1049 1049
1050 case IMGFMT_RAW: 1050 case IMGFMT_RAW:
1051 case IMGFMT_ARAW: 1051 case IMGFMT_ARAW:
1052 { 1052 {
1053 FILE *fp; 1053 FILE *fp;
1054 char *dataFilename, *fext, *tmpFilename = dm_strdup(filename); 1054 char *dataFilename;
1055 1055
1056 // Form data file filename 1056 // Form data file filename
1057 if (tmpFilename == NULL) 1057 dataFilename = dm_strdup_fext(filename, "%s.inc");
1058 if (dataFilename == NULL)
1058 return DMERR_MALLOC; 1059 return DMERR_MALLOC;
1059
1060 fext = strrchr(tmpFilename, '.');
1061 if (fext != NULL)
1062 *fext = 0;
1063 dataFilename = dm_strdup_printf("%s.inc", tmpFilename);
1064 dmFree(tmpFilename);
1065 1060
1066 // Open data file for writing 1061 // Open data file for writing
1067 if ((fp = fopen(dataFilename, "w")) == NULL) 1062 if ((fp = fopen(dataFilename, "w")) == NULL)
1068 dmError("Could not create '%s'.\n", dataFilename); 1063 dmError("Could not create '%s'.\n", dataFilename);
1064
1069 dmFree(dataFilename); 1065 dmFree(dataFilename);
1070 1066
1071 if (fp != NULL) 1067 if (fp != NULL)
1072 { 1068 {
1073 // Strip extension 1069 // Strip extension
1074 int i; 1070 int i;
1075 char *palID = dm_strdup_printf("img_%s", filename); 1071 char *palID = dm_strdup_fext(filename, "img_%s");
1076 char *fext = strrchr(palID, '.');
1077 if (fext != NULL)
1078 *fext = 0;
1079 1072
1080 // Replace any non-alphanumerics 1073 // Replace any non-alphanumerics
1081 for (i = 0; palID[i]; i++) 1074 for (i = 0; palID[i]; i++)
1082 { 1075 {
1083 if (isalnum(palID[i])) 1076 if (isalnum(palID[i]))