Merge branch 'v3-cleanup' into tmp/v3.0.4-alex

* v3-cleanup:
  autoconf: Indentation fixes
  Spelling fixes
  Whitespace and exclamation mark fixes

Conflicts:
	etc/afpd/main.c

diff --git a/NEWS b/NEWS
index 8eac3474d523b14d5345e3cc0a1a3835759330a9..cb54cd87bc2fefa96ac9f1b15804e25dff9528fa 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -298,7 +298,7 @@ Changes in 2.2.2
 Changes in 2.2.1
 ================
 
-* NEW: afpd: disable continous service feature by default, new option
+* NEW: afpd: disable continuous service feature by default, new option
        -keepsessions to enable it
 * NEW: configure option "--enable-redhat-systemd" for Fedora15 and later.
        "--enable-redhat" is renamed "--enable-redhat-sysv".

diff --git a/bin/uniconv/uniconv.c b/bin/uniconv/uniconv.c
index 8a786a601dd4c1c641bc8c3d4c2bb8730e67eea6..c8f80f52699e53ac56d39c8d20e548870f41a6d9 100644 (file)
--- a/bin/uniconv/uniconv.c
+++ b/bin/uniconv/uniconv.c
@@ -184,8 +184,8 @@ static char *convert_name(char *name, struct stat *st, cnid_t cur_did)
                outlen = convert_charset(ch_to, ch_to, ch_mac, (char *)p, strlen((char *)p), (char *)q, sizeof(buffer) -2, &flags);
                if ((size_t)-1 == outlen) {
                        /* it's not UTF8... */
-                       fprintf(stderr, "ERROR: conversion from '%s' to '%s' for '%s' in DID %u failed!!!\n", 
-                               from_charset, to_charset, name, ntohl(cur_did));
+                               fprintf(stderr, "ERROR: conversion from '%s' to '%s' for '%s' in DID %u failed!\n",
+                                       from_charset, to_charset, name, ntohl(cur_did));
                        return name;
                }
 
@@ -441,11 +441,11 @@ static void help (void)
     fprintf (stdout, "\t-V\tPrint version and exit\n");
     fprintf (stdout, "\t-h\tThis help screen\n\n");
     fprintf (stdout, "WARNING:\n");
-    fprintf (stdout, "     Setting the wrong options might render your data unusable!!!\n");
+    fprintf (stdout, "     Setting the wrong options might render your data unusable!\n");
     fprintf (stdout, "     Make sure you know what you are doing. Always backup your data first.\n\n");
     fprintf (stdout, "     It is *strongly* recommended to do a `dry run' first and to check the\n");
     fprintf (stdout, "     output for conversion errors.\n");
-    fprintf (stdout, "     USE AT YOUR OWN RISK!!!\n\n");
+    fprintf (stdout, "     USE AT YOUR OWN RISK!\n\n");
 
 }
 

diff --git a/etc/afpd/auth.c b/etc/afpd/auth.c
index bec624dc6cd32efc72b9838381a5b8f12ad6593b..80cd5339f51494b5dd13d0fd240123c53ddf6b49 100644 (file)
--- a/etc/afpd/auth.c
+++ b/etc/afpd/auth.c
@@ -960,7 +960,7 @@ int afp_getuserinfo(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf,
             atalk_uuid_t uuid;
             ret = getuuidfromname( obj->username, UUID_USER, uuid);
             if (ret != 0) {
-                LOG(log_info, logtype_afpd, "afp_getuserinfo: error getting UUID !");
+                LOG(log_info, logtype_afpd, "afp_getuserinfo: error getting UUID!");
                 return AFPERR_NOITEM;
             }
             LOG(log_debug, logtype_afpd, "afp_getuserinfo: got UUID: %s", uuid_bin2string(uuid));

diff --git a/etc/afpd/status.c b/etc/afpd/status.c
index 35e088499db21c56483139df30e3c7b3d5c7f9de..ec1025dda3922106a2325290fd9ff59fb7d13ce2 100644 (file)
--- a/etc/afpd/status.c
+++ b/etc/afpd/status.c
@@ -656,10 +656,10 @@ void set_signature(struct afp_options *options) {
     if (len == 0) {
         goto server_signature_auto;   /* default */
     } else if (len < 3) {
-        LOG(log_warning, logtype_afpd, "WARNING: signature string %s is very short !", options->signatureopt);
+        LOG(log_warning, logtype_afpd, "WARNING: signature string %s is very short!", options->signatureopt);
         goto server_signature_user;
     } else if (len > 16) {
-        LOG(log_warning, logtype_afpd, "WARNING: signature string %s is very long !", options->signatureopt);
+        LOG(log_warning, logtype_afpd, "WARNING: signature string %s is very long!", options->signatureopt);
         len = 16;
         goto server_signature_user;
     } else {

diff --git a/etc/afpd/volume.c b/etc/afpd/volume.c
index f51223730c32a5047eedd749d935315613e24ff9..205383bb0ee7d939da4d24ba59d7980ba27be109 100644 (file)
--- a/etc/afpd/volume.c
+++ b/etc/afpd/volume.c
@@ -601,7 +601,7 @@ static int volume_codepage(AFPObj *obj, struct vol *volume)
     }
 
     if ( NULL == (charset = find_charset_functions(volume->v_volcodepage)) || charset->flags & CHARSET_ICONV ) {
-        LOG (log_warning, logtype_afpd, "WARNING: volume encoding %s is *not* supported by netatalk, expect problems !!!!", volume->v_volcodepage);
+        LOG (log_warning, logtype_afpd, "WARNING: volume encoding %s is *not* supported by netatalk, expect problems!", volume->v_volcodepage);
     }
 
     if (!volume->v_maccodepage)

diff --git a/libatalk/cnid/cdb/cnid_cdb_close.c b/libatalk/cnid/cdb/cnid_cdb_close.c
index d34a418b7e3cef4b623912d2008a4f54cec5a04e..2e11ea81c23a4466288f17b34216d81ecaf67c0d 100644 (file)
--- a/libatalk/cnid/cdb/cnid_cdb_close.c
+++ b/libatalk/cnid/cdb/cnid_cdb_close.c
@@ -12,7 +12,7 @@ void cnid_cdb_close(struct _cnid_db *cdb) {
     CNID_private *db;
 
     if (!cdb) {
-           LOG(log_error, logtype_afpd, "cnid_close called with NULL argument !");
+           LOG(log_error, logtype_afpd, "cnid_close called with NULL argument!");
            return;
     }
 

diff --git a/libatalk/cnid/cnid.c b/libatalk/cnid/cnid.c
index 7cf3af1618d19a6de2e0cecada09936aeab90508..021cecfbfa35ac6425ef9afbde9b61273458fe6f 100644 (file)
--- a/libatalk/cnid/cnid.c
+++ b/libatalk/cnid/cnid.c
@@ -47,7 +47,7 @@ void cnid_register(struct _cnid_module *module)
     /* Check if our module is already registered. */
     list_for_each(ptr, &modules)
         if (0 == strcmp(list_entry(ptr, cnid_module, db_list)->name, module->name)) {
-        LOG(log_error, logtype_afpd, "Module with name [%s] is already registered !", module->name);
+        LOG(log_error, logtype_afpd, "Module with name [%s] is already registered!", module->name);
         return;
     }
 
@@ -203,7 +203,7 @@ void cnid_close(struct _cnid_db *db)
     uint32_t flags;
 
     if (NULL == db) {
-        LOG(log_error, logtype_afpd, "Error: cnid_close called with NULL argument !");
+        LOG(log_error, logtype_afpd, "Error: cnid_close called with NULL argument!");
         return;
     }
     /* cnid_close free db */

diff --git a/libatalk/cnid/dbd/cnid_dbd.c b/libatalk/cnid/dbd/cnid_dbd.c
index 3f0278ae46aa9678e320e232580c52e53ea38535..ccf01343c13639a963f6423e57a19420179c6a51 100644 (file)
--- a/libatalk/cnid/dbd/cnid_dbd.c
+++ b/libatalk/cnid/dbd/cnid_dbd.c
@@ -484,7 +484,7 @@ void cnid_dbd_close(struct _cnid_db *cdb)
     CNID_private *db;
 
     if (!cdb) {
-        LOG(log_error, logtype_cnid, "cnid_close called with NULL argument !");
+        LOG(log_error, logtype_cnid, "cnid_close called with NULL argument!");
         return;
     }
 

diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
index 1a55276471d8e7c2066fd5db2b12006d0e22c189..cb0fc717fe11daf8e074490de3e6292f0c7dc97f 100644 (file)
--- a/macros/netatalk.m4
+++ b/macros/netatalk.m4
@@ -1107,7 +1107,7 @@ dnl ------ Check for sendfile() --------
 AC_DEFUN([AC_NETATALK_SENDFILE], [
 netatalk_cv_search_sendfile=yes
 AC_ARG_ENABLE(sendfile,
-    [  --disable-sendfile       disable sendfile syscall],
+    [  --disable-sendfile      disable sendfile syscall],
     [if test x"$enableval" = x"no"; then
             netatalk_cv_search_sendfile=no
         fi]

diff --git a/macros/quota-check.m4 b/macros/quota-check.m4
index 703c3568d34d38b36029a2c2e342abb8713af5a3..e2e145e616ed15da19fec87d1729c7ed211f9666 100644 (file)
--- a/macros/quota-check.m4
+++ b/macros/quota-check.m4
@@ -3,7 +3,7 @@ dnl FIXME: This is in now way complete.
 
 AC_DEFUN([AC_NETATALK_CHECK_QUOTA], [
        AC_ARG_ENABLE(quota,
-       [  --enable-quota           Turn on quota support (default=auto)])
+       [  --enable-quota          Turn on quota support (default=auto)])
 
        if test x$enable_quota != xno; then
        QUOTA_LIBS=""

diff --git a/macros/zeroconf.m4 b/macros/zeroconf.m4
index 6916c9905dca7541fe91f50678994695b3674ed3..5a4f1dfc72d7faed0d5993267ea17251a6c7241c 100644 (file)
--- a/macros/zeroconf.m4
+++ b/macros/zeroconf.m4
@@ -7,7 +7,7 @@ AC_DEFUN([AC_NETATALK_ZEROCONF], [
        zeroconf_dir=""
 
        AC_ARG_ENABLE(zeroconf,
-               [  --enable-zeroconf[[=DIR]]   enable Zeroconf support [[auto]]],
+               [  --enable-zeroconf[[=DIR]] enable Zeroconf support [[auto]]],
                [zeroconf=$enableval],
                [zeroconf=try]
        )