girineko/dhcpd-pools
1
0
Fork 0
mirror of git://git.code.sf.net/p/dhcpd-pools/code synced 2025-12-16 15:57:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

unify quotation in error messages

Browse source 
Use quote() from gnulib to do this.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2015-12-04 21:21:13 +00:00
parent d6486e7730
commit 15802d6648
No known key found for this signature in database
GPG key ID: A9553245FDE9B739
4 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
bootstrap.conf
View file

@ -32,6 +32,7 @@ gnulib_modules="
langinfo langinfo
netinet_in netinet_in
progname progname
quote
realloc-gnu realloc-gnu
stat stat
stddef stddef

7
src/dhcpd-pools.c
View file

@ -49,6 +49,7 @@
#include "closeout.h" #include "closeout.h"
#include "error.h" #include "error.h"
#include "progname.h" #include "progname.h"
#include "quote.h"
#include "xalloc.h" #include "xalloc.h"
#include "dhcpd-pools.h" #include "dhcpd-pools.h"
@ -81,7 +82,7 @@ static int return_limit(const char c)
if ('0' <= c && c < '8') if ('0' <= c && c < '8')
return c - '0'; return c - '0';
clean_up(); clean_up();
error(EXIT_FAILURE, 0, "return_limit: output mask '%s' is illegal", optarg); error(EXIT_FAILURE, 0, "return_limit: output mask %s is illegal", quote(optarg));
return 0; return 0;
} }
@ -241,7 +242,7 @@ int main(int argc, char **argv)
/* Print help */ /* Print help */
usage(EXIT_SUCCESS); usage(EXIT_SUCCESS);
default: default:
error(EXIT_FAILURE, 0, "Try `%s --help' for more information.", error(EXIT_FAILURE, 0, "Try %s --help for more information.",
program_name); program_name);
} }
} }
@ -284,7 +285,7 @@ int main(int argc, char **argv)
break; break;
default: default:
clean_up(); clean_up();
error(EXIT_FAILURE, 0, "main: unknown output format '%c'", print_mac_addreses_tmp[0]); error(EXIT_FAILURE, 0, "unknown output format: %s", quote(print_mac_addreses_tmp));
} }
/* Do the job */ /* Do the job */
set_ipv_functions(IPvUNKNOWN); set_ipv_functions(IPvUNKNOWN);

3
src/other.c
View file

@ -51,6 +51,7 @@
#include "error.h" #include "error.h"
#include "progname.h" #include "progname.h"
#include "quote.h"
#include "dhcpd-pools.h" #include "dhcpd-pools.h"
#include "defaults.h" #include "defaults.h"
@ -378,7 +379,7 @@ double strtod_or_err(const char *restrict str, const char *restrict errmesg)
goto err; goto err;
return num; return num;
err: err:
error(EXIT_FAILURE, errno, "%s: '%s'", errmesg, str); error(EXIT_FAILURE, errno, "%s: %s", errmesg, quote(str));
return 0; return 0;
} }

8
src/sort.c
View file

@ -46,6 +46,7 @@
#include "error.h" #include "error.h"
#include "progname.h" #include "progname.h"
#include "quote.h"
#include "dhcpd-pools.h" #include "dhcpd-pools.h"
@ -236,8 +237,11 @@ comparer_t field_selector(char c)
case 'e': case 'e':
return comp_tcperc; return comp_tcperc;
default: default:
clean_up(); {
error(EXIT_FAILURE, 0, "field_selector: unknown sort order `%c'", c); char str[2] = { c, '\0' };
clean_up();
error(EXIT_FAILURE, 0, "field_selector: unknown sort order: %s", quote(str));
}
} }
return NULL; return NULL;
} }