From fa2bdd0fdc97feb0d9e5b4f6c8132dba2bceec72 Mon Sep 17 00:00:00 2001 From: Geoff Johnstone Date: Fri, 30 May 2008 19:16:46 +0100 Subject: [PATCH] Cosmetic improvements. --- conffile.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/conffile.c b/conffile.c index 01cf78e..5388ee9 100644 --- a/conffile.c +++ b/conffile.c @@ -37,13 +37,13 @@ static bool check_conf_perms (const char *conffile, int fd) { if (getuid() != buf.st_uid) { - fprintf (stderr, "You do not own the configuration file %s\n", conffile); + fprintf (stderr, "You do not own the configuration file %s.\n", conffile); return false; } if (buf.st_mode & (S_IRWXG | S_IRWXO)) { - fprintf (stderr, "Configuration file %s is accessible to non-owner\n", + fprintf (stderr, "Configuration file %s is accessible to non-owner.\n", conffile); return false; } @@ -51,7 +51,7 @@ static bool check_conf_perms (const char *conffile, int fd) else { - fprintf (stderr, "Cannot stat configuration file %s: %s\n", + fprintf (stderr, "Cannot stat configuration file %s: %s.\n", conffile, strerror (errno)); return false; } @@ -67,7 +67,7 @@ static bool conffile_read (const char *filename, int fd = open (filename, O_RDONLY); if (-1 == fd) { - fprintf (stderr, "Cannot open %s: %s\n", filename, strerror (errno)); + fprintf (stderr, "Cannot open %s: %s.\n", filename, strerror (errno)); return false; } @@ -77,19 +77,18 @@ static bool conffile_read (const char *filename, return false; } - //*doc = xmlParseFile (filename); *doc = xmlReadFd (fd, NULL, NULL, XML_PARSE_NONET); (void)close (fd); if (NULL == *doc) { - fprintf (stderr, "Cannot parse %s\n", filename); + fprintf (stderr, "Cannot parse %s.\n", filename); return false; } if (!xml_validate_relaxng (*doc, rng_config)) { - fprintf (stderr, "%s isn't a valid USMB configuration\n", filename); + fprintf (stderr, "%s isn't a valid USMB configuration.\n", filename); xmlFreeDoc (*doc); return false; } @@ -97,7 +96,7 @@ static bool conffile_read (const char *filename, *ctx = xmlXPathNewContext (*doc); if (NULL == *ctx) { - fputs ("Cannot create XPath context\n", stderr); + fputs ("Cannot create XPath context.\n", stderr); xmlFreeDoc (*doc); return false; } @@ -133,7 +132,7 @@ bool conffile_get_mount (const char *filename, const char *key, if (strchr (key, '\'')) { - fprintf (stderr, "Invalid share name: %s\n", key); + fprintf (stderr, "Invalid share name: %s.\n", key); return false; } -- 2.11.4.GIT