/****************************************************************************
- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
#include <dump_entry.h>
-MODULE_ID("$Id: infocmp.c,v 1.102 2008/08/04 13:05:18 tom Exp $")
+MODULE_ID("$Id: infocmp.c,v 1.104 2009/12/05 21:10:31 tom Exp $")
#define L_CURL "{"
#define R_CURL "}"
useeq(ENTRY * e1, ENTRY * e2)
/* are the use references in two entries equivalent? */
{
- int i, j;
+ unsigned i, j;
if (e1->nuses != e2->nuses)
return (FALSE);
print_uses(ENTRY * ep, FILE *fp)
/* print an entry's use references */
{
- int i;
+ unsigned i;
if (!ep->nuses)
fputs("NULL", fp);
if (!expansion) {
csi = skip_csi(sp);
for (ap = std_caps; ap->from; ap++) {
- size_t adj = (size_t)(csi ? 2 : 0);
+ size_t adj = (size_t) (csi ? 2 : 0);
len = strlen(ap->from);
if (csi && skip_csi(ap->from) != csi)
*
***************************************************************************/
+#if NO_LEAKS
+#define MAIN_LEAKS() \
+ free(myargv); \
+ free(tfile); \
+ free(tname)
+#else
+#define MAIN_LEAKS() /* nothing */
+#endif
+
int
main(int argc, char *argv[])
{
_nc_progname = _nc_rootname(argv[0]);
/* make sure we have enough space to add two terminal entries */
- myargv = typeCalloc(char *, (size_t)(argc + 3));
+ myargv = typeCalloc(char *, (size_t) (argc + 3));
memcpy(myargv, argv, (sizeof(char *) * (size_t) argc));
argv = myargv;
#else
(void) fprintf(stderr, "%s: terminfo files not supported\n",
_nc_progname);
+ MAIN_LEAKS();
ExitProgram(EXIT_FAILURE);
#endif
} else {
"%s: couldn't open terminfo file %s.\n",
_nc_progname,
tfile[termcount]);
+ MAIN_LEAKS();
ExitProgram(EXIT_FAILURE);
}
repair_acsc(&entries[termcount].tterm);
else
file_comparison(argc - optind, argv + optind);
-#if NO_LEAKS
- free(myargv);
- free(tfile);
- free(tname);
-#endif
+ MAIN_LEAKS();
ExitProgram(EXIT_SUCCESS);
}