fnt2fon: janitorial IgnoredReturnValues.
Lionel Debroux
lionel_debroux at yahoo.fr
Fri Sep 14 07:18:09 CDT 2007
---
tools/fnt2fon.c | 92 +++++++++++++++++++++++++++---------------------------
1 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/tools/fnt2fon.c b/tools/fnt2fon.c
index 3d376f5..156d86b 100644
--- a/tools/fnt2fon.c
+++ b/tools/fnt2fon.c
@@ -157,9 +157,9 @@ static void error(const char *s, ...)
{
va_list ap;
va_start(ap, s);
- fprintf(stderr, "Error: ");
- vfprintf(stderr, s, ap);
- fprintf(stderr, "\n");
+ (void)fprintf(stderr, "Error: ");
+ (void)vfprintf(stderr, s, ap);
+ (void)fprintf(stderr, "\n");
va_end(ap);
exit(1);
}
@@ -211,23 +211,23 @@ int main(int argc, char **argv)
exit(1);
}
fp_is_open = TRUE;
- fread(&ver, sizeof(short), 1, fp);
+ Fread(&ver, sizeof(short), 1, fp);
if(ver != 0x200 && ver != 0x300) {
error("invalid fnt file %s ver %d", argv[i+1], ver);
}
- fread(file_lens + i, sizeof(int), 1, fp);
- fseek(fp, 0x44, SEEK_SET);
- fread(&pt, sizeof(short), 1, fp);
- fread(dpi, sizeof(short), 2, fp);
- fseek(fp, 0x69, SEEK_SET);
- fread(&off, sizeof(long), 1, fp);
- fseek(fp, off, SEEK_SET);
+ Fread(file_lens + i, sizeof(int), 1, fp);
+ Fseek(fp, 0x44, SEEK_SET);
+ Fread(&pt, sizeof(short), 1, fp);
+ Fread(dpi, sizeof(short), 2, fp);
+ Fseek(fp, 0x69, SEEK_SET);
+ Fread(&off, sizeof(long), 1, fp);
+ Fseek(fp, off, SEEK_SET);
cp = name;
while((c = fgetc(fp)) != 0 && c != EOF)
*cp++ = c;
*cp = '\0';
fprintf(stderr, "%s %d pts %dx%d dpi\n", name, pt, dpi[0], dpi[1]);
- fclose(fp);
+ Fclose(fp);
fp = NULL; fp_is_open = FALSE;
/* fontdir entries for version 3 fonts are the same as for version 2 */
fontdir_len += 0x74 + strlen(name) + 1;
@@ -284,16 +284,16 @@ int main(int argc, char **argv)
exit(1);
}
- fwrite(MZ_hdr, sizeof(MZ_hdr), 1, ofp);
- fwrite(&NE_hdr, sizeof(NE_hdr), 1, ofp);
+ Fwrite(MZ_hdr, sizeof(MZ_hdr), 1, ofp);
+ Fwrite(&NE_hdr, sizeof(NE_hdr), 1, ofp);
align = 4;
- fwrite(&align, sizeof(align), 1, ofp);
+ Fwrite(&align, sizeof(align), 1, ofp);
rc_type.type_id = NE_RSCTYPE_FONTDIR;
rc_type.count = 1;
rc_type.resloader = 0;
- fwrite(&rc_type, sizeof(rc_type), 1, ofp);
+ Fwrite(&rc_type, sizeof(rc_type), 1, ofp);
rc_name.offset = fontdir_off >> 4;
rc_name.length = (fontdir_len + 15) >> 4;
@@ -301,12 +301,12 @@ int main(int argc, char **argv)
rc_name.id = resident_name_off - sizeof("FONTDIR") - NE_hdr.ne_rsrctab;
rc_name.handle = 0;
rc_name.usage = 0;
- fwrite(&rc_name, sizeof(rc_name), 1, ofp);
+ Fwrite(&rc_name, sizeof(rc_name), 1, ofp);
rc_type.type_id = NE_RSCTYPE_FONT;
rc_type.count = num_files;
rc_type.resloader = 0;
- fwrite(&rc_type, sizeof(rc_type), 1, ofp);
+ Fwrite(&rc_type, sizeof(rc_type), 1, ofp);
for(res = first_res | 0x8000, i = 0; i < num_files; i++, res++) {
int len = (file_lens[i] + 15) & ~0xf;
@@ -317,59 +317,59 @@ int main(int argc, char **argv)
rc_name.id = res;
rc_name.handle = 0;
rc_name.usage = 0;
- fwrite(&rc_name, sizeof(rc_name), 1, ofp);
+ Fwrite(&rc_name, sizeof(rc_name), 1, ofp);
font_off += len;
}
/* empty type info */
memset(&rc_type, 0, sizeof(rc_type));
- fwrite(&rc_type, sizeof(rc_type), 1, ofp);
+ Fwrite(&rc_type, sizeof(rc_type), 1, ofp);
- fputc(strlen("FONTDIR"), ofp);
- fwrite("FONTDIR", strlen("FONTDIR"), 1, ofp);
- fputc(strlen(resident_name), ofp);
- fwrite(resident_name, strlen(resident_name), 1, ofp);
+ Fputc(strlen("FONTDIR"), ofp);
+ Fwrite("FONTDIR", strlen("FONTDIR"), 1, ofp);
+ Fputc(strlen(resident_name), ofp);
+ Fwrite(resident_name, strlen(resident_name), 1, ofp);
- fputc(0x00, ofp); fputc(0x00, ofp);
- fputc(0x00, ofp);
- fputc(0x00, ofp); fputc(0x00, ofp);
+ Fputc(0x00, ofp); Fputc(0x00, ofp);
+ Fputc(0x00, ofp);
+ Fputc(0x00, ofp); Fputc(0x00, ofp);
- fputc(strlen(non_resident_name), ofp);
- fwrite(non_resident_name, strlen(non_resident_name), 1, ofp);
- fputc(0x00, ofp); /* terminator */
+ Fputc(strlen(non_resident_name), ofp);
+ Fwrite(non_resident_name, strlen(non_resident_name), 1, ofp);
+ Fputc(0x00, ofp); /* terminator */
/* empty ne_modtab and ne_imptab */
- fputc(0x00, ofp);
- fputc(0x00, ofp);
+ Fputc(0x00, ofp);
+ Fputc(0x00, ofp);
pad = ftell(ofp) & 0xf;
if(pad != 0)
pad = 0x10 - pad;
for(i = 0; i < pad; i++)
- fputc(0x00, ofp);
+ Fputc(0x00, ofp);
/* FONTDIR resource */
- fwrite(&num_files, sizeof(num_files), 1, ofp);
+ Fwrite(&num_files, sizeof(num_files), 1, ofp);
for(res = first_res, i = 0; i < num_files; i++, res++) {
- fp = fopen(argv[i+1], "rb");
+ fp = Fopen(argv[i+1], "rb");
fp_is_open = TRUE;
- fwrite(&res, sizeof(res), 1, ofp);
- fread(buf, 0x72, 1, fp);
+ Fwrite(&res, sizeof(res), 1, ofp);
+ Fread(buf, 0x72, 1, fp);
fnt_header = (struct _fnt_header *)buf;
- fseek(fp, fnt_header->fi.dfFace, SEEK_SET);
+ Fseek(fp, fnt_header->fi.dfFace, SEEK_SET);
fnt_header->fi.dfBitsOffset = 0;
- fwrite(buf, 0x72, 1, ofp);
+ Fwrite(buf, 0x72, 1, ofp);
cp = name;
while((c = fgetc(fp)) != 0 && c != EOF)
*cp++ = c;
*cp = '\0';
- fwrite(name, strlen(name) + 1, 1, ofp);
- fclose(fp);
+ Fwrite(name, strlen(name) + 1, 1, ofp);
+ Fclose(fp);
fp = NULL; fp_is_open = FALSE;
}
@@ -377,7 +377,7 @@ int main(int argc, char **argv)
if(pad != 0)
pad = 0x10 - pad;
for(i = 0; i < pad; i++)
- fputc(0x00, ofp);
+ Fputc(0x00, ofp);
for(res = first_res, i = 0; i < num_files; i++, res++) {
fp = fopen(argv[i+1], "rb");
@@ -386,17 +386,17 @@ int main(int argc, char **argv)
while(1) {
nread = read(fileno(fp), buf, sizeof(buf));
if(!nread) break;
- fwrite(buf, nread, 1, ofp);
+ Fwrite(buf, nread, 1, ofp);
}
- fclose(fp);
+ Fclose(fp);
fp = NULL; fp_is_open = FALSE;
pad = file_lens[i] & 0xf;
if(pad != 0)
pad = 0x10 - pad;
for(j = 0; j < pad; j++)
- fputc(0x00, ofp);
+ Fputc(0x00, ofp);
}
- fclose(ofp);
+ Fclose(ofp);
ofp = NULL;
output_file = NULL;
--
1.5.2.4
--------------040602080203060601020803--
More information about the wine-patches
mailing list