if (nl != NULL)
{
if (mcset_out_values_are_decimal)
- fprintf (fp, "//\n// MessageId: 0x%lu\n//\n", (unsigned long) vid);
+ fprintf (fp, "//\n// MessageId: %lu\n//\n", (unsigned long) vid);
else
fprintf (fp, "//\n// MessageId: 0x%lx\n//\n", (unsigned long) vid);
}
(tdef ? "(" : ""), (tdef ? tdef : ""), (tdef ? ")" : ""),
(unsigned long) vid);
else
- fprintf (fp, "#define %s %s%s%s 0x%lu\n\n", sym,
+ fprintf (fp, "#define %s %s%s%s %lu\n\n", sym,
(tdef ? "(" : ""), (tdef ? tdef : ""), (tdef ? ")" : ""),
(unsigned long) vid);
}
while (h != NULL)
{
if (h->symbol)
- write_dbg_define (fp, h->symbol, mcset_msg_id_typedef);
+ write_dbg_define (fp, h->symbol, h->id_typecast);
h = h->next;
}
fprintf (fp, " { (");
fprintf (fp, "#define %s 0x%lx\n", convert_unicode_to_ACP (key->sval),
(unsigned long) key->nval);
else
- fprintf (fp, "#define %s 0x%lu\n", convert_unicode_to_ACP (key->sval),
+ fprintf (fp, "#define %s %lu\n", convert_unicode_to_ACP (key->sval),
(unsigned long) key->nval);
}
}
fprintf (fp, "#define %s 0x%lx\n", convert_unicode_to_ACP (key->sval),
(unsigned long) key->nval);
else
- fprintf (fp, "#define %s 0x%lu\n", convert_unicode_to_ACP (key->sval),
+ fprintf (fp, "#define %s %lu\n", convert_unicode_to_ACP (key->sval),
(unsigned long) key->nval);
}
}
fprintf (fp, "%s", s);
}
if (h->symbol)
- write_header_define (fp, h->symbol, h->vid, mcset_msg_id_typedef, h->sub);
+ write_header_define (fp, h->symbol, h->vid, h->id_typecast, h->sub);
h = h->next;
}
}
hsz = xmalloc (strlen (path) + 2);
strcpy (hsz, path);
end = hsz + strlen (hsz);
- if (hsz[-1] != '/' && hsz[-1] != '\\')
+ if (end[-1] != '/' && end[-1] != '\\')
strcpy (end, "/");
while ((end = strchr (hsz, '\\')) != NULL)
*end = '/';
}
write_bin ();
- if (mc_nodes_lang)
- free (mc_nodes_lang);
- if (mc_severity_codes)
- free (mc_severity_codes);
- if (mc_facility_codes)
- free (mc_facility_codes);
+ free (mc_nodes_lang);
+ free (mc_severity_codes);
+ free (mc_facility_codes);
xexit (0);
return 0;