summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Sexton <WSDMatty@gmail.com>2019-09-09 04:52:57 +0200
committerAllan McRae <allan@archlinux.org>2019-10-07 04:15:02 +0200
commita6ae5f0a04cd3cac70525f073bdb11e4bb9266e5 (patch)
treeb6edf9af186a82cd3e84e84f12bbe628ecc75519
parentb4e4b74acea3d652317b030e761300d5c7b437a2 (diff)
downloadpacman-a6ae5f0a04cd3cac70525f073bdb11e4bb9266e5.tar.gz
pacman-a6ae5f0a04cd3cac70525f073bdb11e4bb9266e5.tar.xz
pacman: pacman-conf: removed hputs macro for usage display
Using the macro got in the way of _() macro for translation All the macro did was make it so the writer didn't have to type \n", stream); at the end of every line. Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--src/pacman/pacman-conf.c24
1 files changed, 11 insertions, 13 deletions
diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c
index df874029..d9e596b8 100644
--- a/src/pacman/pacman-conf.c
+++ b/src/pacman/pacman-conf.c
@@ -37,19 +37,17 @@ static void cleanup(void)
static void usage(int ret)
{
FILE *stream = (ret ? stderr : stdout);
-#define hputs(x) fputs(x"\n", stream)
- hputs("pacman-conf - query pacman's configuration file");
- hputs("usage: pacman-conf [options] [<directive>...]");
- hputs(" pacman-conf (--repo-list|--help|--version)");
- hputs("options:");
- hputs(" -c, --config=<path> set an alternate configuration file");
- hputs(" -R, --rootdir=<path> set an alternate installation root");
- hputs(" -r, --repo=<remote> query options for a specific repo");
- hputs(" -v, --verbose always show directive names");
- hputs(" -l, --repo-list list configured repositories");
- hputs(" -h, --help display this help information");
- hputs(" -V, --version display version information");
-#undef hputs
+ fputs("pacman-conf - query pacman's configuration file\n", stream);
+ fputs("usage: pacman-conf [options] [<directive>...]\n", stream);
+ fputs(" pacman-conf (--repo-list|--help|--version)\n", stream);
+ fputs("options:\n", stream);
+ fputs(" -c, --config=<path> set an alternate configuration file\n", stream);
+ fputs(" -R, --rootdir=<path> set an alternate installation root\n", stream);
+ fputs(" -r, --repo=<remote> query options for a specific repo\n", stream);
+ fputs(" -v, --verbose always show directive names\n", stream);
+ fputs(" -l, --repo-list list configured repositories\n", stream);
+ fputs(" -h, --help display this help information\n", stream);
+ fputs(" -V, --version display version information\n", stream);
cleanup();
exit(ret);
}