From 3a6f590a7761b4b004e27f1fbe6d61b98287fc39 Mon Sep 17 00:00:00 2001
From: didg <didg>
Date: Wed, 12 May 2004 21:21:48 +0000
Subject: [PATCH] remove '\n' char in log messages.

---
 etc/afpd/afp_options.c         |  4 ++--
 etc/afpd/main.c                |  4 ++--
 etc/afpd/nfsquota.c            |  6 +++---
 etc/afpd/quota.c               |  6 +++---
 etc/afpd/unix.c                | 14 +++++++-------
 etc/atalkd/main.c              |  6 +++---
 etc/atalkd/rtmp.c              |  4 ++--
 etc/atalkd/zip.c               |  6 +++---
 etc/papd/lp.c                  |  6 +++---
 etc/papd/main.c                |  6 +++---
 libatalk/unicode/charcnv.c     |  6 +++---
 libatalk/unicode/util_unistr.c |  2 +-
 12 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/etc/afpd/afp_options.c b/etc/afpd/afp_options.c
index 6c13c1de..cad72ee2 100644
--- a/etc/afpd/afp_options.c
+++ b/etc/afpd/afp_options.c
@@ -1,5 +1,5 @@
 /*
- * $Id: afp_options.c,v 1.30.2.2.2.6 2004-01-25 11:52:14 bfernhomberg Exp $
+ * $Id: afp_options.c,v 1.30.2.2.2.7 2004-05-12 21:21:48 didg Exp $
  *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
@@ -435,7 +435,7 @@ int afp_options_parseline(char *buf, struct afp_options *options)
         struct in_addr inaddr;
         if (inet_aton(c, &inaddr) && (opt = strdup(c))) {
             if (!gethostbyaddr((const char *) &inaddr, sizeof(inaddr), AF_INET))
-                LOG(log_info, logtype_afpd, "WARNING: can't find %s\n", opt);
+                LOG(log_info, logtype_afpd, "WARNING: can't find %s", opt);
             options->ipaddr = opt;
         }
     }
diff --git a/etc/afpd/main.c b/etc/afpd/main.c
index dddf099b..a044e466 100644
--- a/etc/afpd/main.c
+++ b/etc/afpd/main.c
@@ -1,5 +1,5 @@
 /*
- * $Id: main.c,v 1.20.4.2.2.8 2004-05-04 15:38:25 didg Exp $
+ * $Id: main.c,v 1.20.4.2.2.9 2004-05-12 21:21:48 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -279,7 +279,7 @@ char	**av;
 
     sigprocmask(SIG_BLOCK, &sigs, NULL);
     if (!(configs = configinit(&default_options))) {
-        LOG(log_error, logtype_afpd, "main: no servers configured: %s\n", strerror(errno));
+        LOG(log_error, logtype_afpd, "main: no servers configured: %s", strerror(errno));
         afp_exit(EXITERR_CONF);
     }
     sigprocmask(SIG_UNBLOCK, &sigs, NULL);
diff --git a/etc/afpd/nfsquota.c b/etc/afpd/nfsquota.c
index 020a87ca..2b4b30d0 100644
--- a/etc/afpd/nfsquota.c
+++ b/etc/afpd/nfsquota.c
@@ -1,5 +1,5 @@
 /*
- * $Id: nfsquota.c,v 1.10.8.2 2004-01-15 08:12:57 bfernhomberg Exp $
+ * $Id: nfsquota.c,v 1.10.8.3 2004-05-12 21:21:48 didg Exp $
  *
  * parts of this are lifted from the bsd quota program and are
  * therefore under the following copyright:
@@ -143,7 +143,7 @@ int getnfsquota(const struct vol *vol, const int uid, const u_int32_t bsize,
         break;
 
     case Q_EPERM:
-        LOG(log_error, logtype_afpd, "nfsquota: quota permission error, host: %s\n",
+        LOG(log_error, logtype_afpd, "nfsquota: quota permission error, host: %s",
             vol->v_gvs);
         break;
 
@@ -179,7 +179,7 @@ int getnfsquota(const struct vol *vol, const int uid, const u_int32_t bsize,
         break;
 
     default:
-        LOG(log_info, logtype_afpd, "bad rpc result, host: %s\n", vol->v_gvs);
+        LOG(log_info, logtype_afpd, "bad rpc result, host: %s", vol->v_gvs);
         break;
     }
 
diff --git a/etc/afpd/quota.c b/etc/afpd/quota.c
index fc35b875..7599caf1 100644
--- a/etc/afpd/quota.c
+++ b/etc/afpd/quota.c
@@ -1,5 +1,5 @@
 /*
- * $Id: quota.c,v 1.22.8.9 2004-04-06 23:05:15 bfernhomberg Exp $
+ * $Id: quota.c,v 1.22.8.10 2004-05-12 21:21:48 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -103,7 +103,7 @@ static void linuxquota_get_api( void )
         sig.sa_flags     = 0;
         sigemptyset(&sig.sa_mask);
         if (sigaction(SIGSEGV, &sig, &oldsig) < 0) {
-	    LOG( log_error, logtype_afpd, "cannot set SEGV signal handler: %s\n", strerror(errno));
+	    LOG( log_error, logtype_afpd, "cannot set SEGV signal handler: %s", strerror(errno));
             goto failure;
         }
         if (quotactl(QCMD(Q_V2_GETSTATS, 0), NULL, 0, (void *)&v2_stats) >= 0) {
@@ -150,7 +150,7 @@ static void linuxquota_get_api( void )
             }
         }
         if (sigaction(SIGSEGV, &oldsig, NULL) < 0) {
-	    LOG(log_error, logtype_afpd, "cannot reset signal handler: %s\n", strerror(errno));
+	    LOG(log_error, logtype_afpd, "cannot reset signal handler: %s", strerror(errno));
             goto failure;
         }
     }
diff --git a/etc/afpd/unix.c b/etc/afpd/unix.c
index 82b84eb3..b581af6a 100644
--- a/etc/afpd/unix.c
+++ b/etc/afpd/unix.c
@@ -1,5 +1,5 @@
 /*
- * $Id: unix.c,v 1.43.2.1.2.7 2004-05-10 18:40:32 didg Exp $
+ * $Id: unix.c,v 1.43.2.1.2.8 2004-05-12 21:21:48 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -791,19 +791,19 @@ static int recursive_chown(const char *path, uid_t uid, gid_t gid) {
     newpath[PATH_MAX] = '\0';
     
     if (chown(path, uid, gid) < 0) {
-        LOG(log_error, logtype_afpd, "cannot chown() file [%s] (uid = %d): %s\n", path, uid, strerror(errno));
+        LOG(log_error, logtype_afpd, "cannot chown() file [%s] (uid = %d): %s", path, uid, strerror(errno));
 	return -1;
     }
 
     if (stat(path, &sbuf) < 0) {
-	LOG(log_error, logtype_afpd, "cannot chown() file [%s] (uid = %d): %s\n", path, uid, strerror(errno));
+	LOG(log_error, logtype_afpd, "cannot chown() file [%s] (uid = %d): %s", path, uid, strerror(errno));
 	return -1;
     }
 	
     if (S_ISDIR(sbuf.st_mode)) {
 	odir = opendir(path);
 	if (odir == NULL) {
-	    LOG(log_error, logtype_afpd, "cannot opendir() [%s] (uid = %d): %s\n", path, uid, strerror(errno));
+	    LOG(log_error, logtype_afpd, "cannot opendir() [%s] (uid = %d): %s", path, uid, strerror(errno));
 	    goto recursive_chown_end;
 	}
 	while (NULL != (entry=readdir(odir)) ) {
@@ -849,7 +849,7 @@ int unix_rename(const char *oldpath, const char *newpath)
         pd_name[i++] = '.'; pd_name[i++] = '\0';
 
         if (stat(pd_name, &pd_stat) < 0) {
-	    LOG(log_error, logtype_afpd, "stat() of parent dir failed: pd_name = %s, uid = %d: %s\n",
+	    LOG(log_error, logtype_afpd, "stat() of parent dir failed: pd_name = %s, uid = %d: %s",
 		pd_name, geteuid(), strerror(errno));
 		return 0;
 	}
@@ -858,9 +858,9 @@ int unix_rename(const char *oldpath, const char *newpath)
         if ((S_ISGID & pd_stat.st_mode)	!= 0) {
             uid = geteuid();
             if (seteuid(0) < 0)
-		LOG(log_error, logtype_afpd, "seteuid() failed: %s\n", strerror(errno));
+		LOG(log_error, logtype_afpd, "seteuid() failed: %s", strerror(errno));
             if (recursive_chown(newpath, uid, pd_stat.st_gid) < 0)
-		LOG(log_error, logtype_afpd, "chown() of parent dir failed: newpath=%s, uid=%d: %s\n",
+		LOG(log_error, logtype_afpd, "chown() of parent dir failed: newpath=%s, uid=%d: %s",
 		    pd_name, geteuid(), strerror(errno));
             seteuid(uid);
 	}
diff --git a/etc/atalkd/main.c b/etc/atalkd/main.c
index 9324514d..7f7ba6b5 100644
--- a/etc/atalkd/main.c
+++ b/etc/atalkd/main.c
@@ -1,5 +1,5 @@
 /*
- * $Id: main.c,v 1.17.8.5 2004-02-28 10:56:26 bfernhomberg Exp $
+ * $Id: main.c,v 1.17.8.6 2004-05-12 21:21:48 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -695,7 +695,7 @@ consistency()
 	for ( lr = zt->zt_rt; lr; lr = lr->l_next ) {
 	    rtmp = (struct rtmptab *)lr->l_data;
 	    if ( rtmp->rt_iprev == 0 && rtmp->rt_gate != 0 ) {
-		LOG(log_error, logtype_atalkd, "%.*s has %u-%u (unused)\n",
+		LOG(log_error, logtype_atalkd, "%.*s has %u-%u (unused)",
 			zt->zt_len, zt->zt_name, ntohs( rtmp->rt_firstnet ),
 			ntohs( rtmp->rt_lastnet ));
 		atalkd_exit(1);
@@ -706,7 +706,7 @@ consistency()
 		}
 	    }
 	    if ( lz == 0 ) {
-		LOG(log_error, logtype_atalkd, "no map from %u-%u to %.*s\n", 
+		LOG(log_error, logtype_atalkd, "no map from %u-%u to %.*s", 
 			ntohs( rtmp->rt_firstnet ),
 			ntohs( rtmp->rt_lastnet ),
 			zt->zt_len, zt->zt_name );
diff --git a/etc/atalkd/rtmp.c b/etc/atalkd/rtmp.c
index 7e384e5a..7c879556 100644
--- a/etc/atalkd/rtmp.c
+++ b/etc/atalkd/rtmp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rtmp.c,v 1.12 2002-09-29 23:24:47 sibaz Exp $
+ * $Id: rtmp.c,v 1.12.8.1 2004-05-12 21:21:48 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -800,7 +800,7 @@ int rtmp_packet( ap, from, data, len )
 		    from->sat_addr.s_node );
 #endif /* DEBUG */
 	} else {
-	    LOG(log_info, logtype_atalkd, "rtmp_packet unknown request from %u.%u\n",
+	    LOG(log_info, logtype_atalkd, "rtmp_packet unknown request from %u.%u",
 		    ntohs( from->sat_addr.s_net ), from->sat_addr.s_node );
 	}
 	break;
diff --git a/etc/atalkd/zip.c b/etc/atalkd/zip.c
index e62fef23..df858097 100644
--- a/etc/atalkd/zip.c
+++ b/etc/atalkd/zip.c
@@ -1,5 +1,5 @@
 /*
- * $Id: zip.c,v 1.11.8.1 2004-01-10 08:09:12 bfernhomberg Exp $
+ * $Id: zip.c,v 1.11.8.2 2004-05-12 21:21:48 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -753,7 +753,7 @@ int zip_packet( ap, from, data, len )
 	    break;
 
 	default :
-	    LOG(log_info, logtype_atalkd, "zip_packet bad zip op from %u.%u\n",
+	    LOG(log_info, logtype_atalkd, "zip_packet bad zip op from %u.%u",
 		    ntohs( from->sat_addr.s_net ), from->sat_addr.s_node );
 	}
 	break;
@@ -890,7 +890,7 @@ int zip_packet( ap, from, data, len )
 	break;
 
     default :
-	LOG(log_info, logtype_atalkd, "zip_packet bad ddp type from %u.%u\n",
+	LOG(log_info, logtype_atalkd, "zip_packet bad ddp type from %u.%u",
 		ntohs( from->sat_addr.s_net ), from->sat_addr.s_node );
 	return 1;
     }
diff --git a/etc/papd/lp.c b/etc/papd/lp.c
index 299b748e..bddc605d 100644
--- a/etc/papd/lp.c
+++ b/etc/papd/lp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: lp.c,v 1.14.8.1 2004-02-20 20:53:14 bfernhomberg Exp $
+ * $Id: lp.c,v 1.14.8.2 2004-05-12 21:21:49 didg Exp $
  *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -588,7 +588,7 @@ int lp_conn_inet()
     struct hostent	*hp;
 
     if (( sp = getservbyname( "printer", "tcp" )) == NULL ) {
-	LOG(log_error, logtype_papd, "printer/tcp: unknown service\n" );
+	LOG(log_error, logtype_papd, "printer/tcp: unknown service" );
 	return( -1 );
     }
 
@@ -598,7 +598,7 @@ int lp_conn_inet()
     }
 
     if (( hp = gethostbyname( hostname )) == NULL ) {
-	LOG(log_error, logtype_papd, "%s: unknown host\n", hostname );
+	LOG(log_error, logtype_papd, "%s: unknown host", hostname );
 	return( -1 );
     }
 
diff --git a/etc/papd/main.c b/etc/papd/main.c
index 4f83c7a5..4283510c 100644
--- a/etc/papd/main.c
+++ b/etc/papd/main.c
@@ -1,5 +1,5 @@
 /*
- * $Id: main.c,v 1.18 2003-02-17 01:31:51 srittau Exp $
+ * $Id: main.c,v 1.18.6.1 2004-05-12 21:21:49 didg Exp $
  *
  * Copyright (c) 1990,1995 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -121,11 +121,11 @@ die( n )
     for ( pr = printers; pr; pr = pr->p_next ) {
 	if ( pr->p_flags & P_REGISTERED ) {
 	    if ( nbp_unrgstr( pr->p_name, pr->p_type, pr->p_zone, &addr ) < 0 ) {
-		LOG(log_error, logtype_papd, "can't unregister %s:%s@%s\n", pr->p_name,
+		LOG(log_error, logtype_papd, "can't unregister %s:%s@%s", pr->p_name,
 			pr->p_type, pr->p_zone );
 		papd_exit( n + 1 );
 	    }
-	    LOG(log_error, logtype_papd, "unregister %s:%s@%s\n", pr->p_name, pr->p_type,
+	    LOG(log_error, logtype_papd, "unregister %s:%s@%s", pr->p_name, pr->p_type,
 		    pr->p_zone );
 	}
     }
diff --git a/libatalk/unicode/charcnv.c b/libatalk/unicode/charcnv.c
index 5d17c996..539f9a86 100644
--- a/libatalk/unicode/charcnv.c
+++ b/libatalk/unicode/charcnv.c
@@ -375,7 +375,7 @@ static size_t convert_string_allocate_internal(charset_t from, charset_t to,
 
 	if (descriptor == (atalk_iconv_t)-1 || descriptor == (atalk_iconv_t)0) {
 		/* conversion not supported, return -1*/
-		LOG(log_debug, logtype_default, "convert_string_allocate: conversion not supported!\n");
+		LOG(log_debug, logtype_default, "convert_string_allocate: conversion not supported!");
 		return -1;
 	}
 
@@ -384,7 +384,7 @@ convert:
 	destlen = destlen * 2;
 	ob = (char *)realloc(ob, destlen);
 	if (!ob) {
-		LOG(log_debug, logtype_default,"convert_string_allocate: realloc failed!\n");
+		LOG(log_debug, logtype_default,"convert_string_allocate: realloc failed!");
 		SAFE_FREE(outbuf);
 		return (size_t)-1;
 	} else {
@@ -430,7 +430,7 @@ convert:
 	}
 
 	if (destlen && !*dest) {
-		LOG(log_debug, logtype_default, "convert_string_allocate: out of memory!\n");
+		LOG(log_debug, logtype_default, "convert_string_allocate: out of memory!");
 		SAFE_FREE(ob);
 		return (size_t)-1;
 	}
diff --git a/libatalk/unicode/util_unistr.c b/libatalk/unicode/util_unistr.c
index 3e498dc9..4f4921b3 100644
--- a/libatalk/unicode/util_unistr.c
+++ b/libatalk/unicode/util_unistr.c
@@ -250,7 +250,7 @@ ucs2_t *strndup_w(const ucs2_t *src, size_t len)
         if (!len) len = strlen_w(src);
         dest = (ucs2_t *)malloc((len + 1) * sizeof(ucs2_t));
         if (!dest) {
-                LOG (log_error, logtype_default, "strdup_w: out of memory!\n");
+                LOG (log_error, logtype_default, "strdup_w: out of memory!");
                 return NULL;
         }
 
-- 
2.39.2