From aa5a13f6035d5e5ce0e35fba3e04a38a907e8382 Mon Sep 17 00:00:00 2001 From: didg Date: Tue, 11 Jan 2005 23:00:40 +0000 Subject: [PATCH] remove trailing \n char in LOG calls. --- etc/papd/print_cups.c | 16 ++++++++-------- libatalk/dsi/dsi_tcp.c | 6 +++--- libatalk/util/fault.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/etc/papd/print_cups.c b/etc/papd/print_cups.c index dbc91157..07148d3b 100644 --- a/etc/papd/print_cups.c +++ b/etc/papd/print_cups.c @@ -1,5 +1,5 @@ /* - * $Id: print_cups.c,v 1.1.2.1 2004-06-09 01:25:54 bfernhomberg Exp $ + * $Id: print_cups.c,v 1.1.2.1.2.1 2005-01-11 23:00:40 didg Exp $ * * Copyright 2004 Bjoern Fernhomberg. * @@ -113,7 +113,7 @@ cups_printername_ok(char *name) /* I - Name of printer */ if ((http = httpConnect(cupsServer(), ippPort())) == NULL) { - LOG(log_error, logtype_papd, "Unable to connect to CUPS server %s - %s\n", + LOG(log_error, logtype_papd, "Unable to connect to CUPS server %s - %s", cupsServer(), strerror(errno)); return (0); } @@ -156,7 +156,7 @@ cups_printername_ok(char *name) /* I - Name of printer */ if ((response = cupsDoRequest(http, request, "/")) == NULL) { - LOG(log_error, logtype_papd, "Unable to get printer status for %s - %s\n", name, + LOG(log_error, logtype_papd, "Unable to get printer status for %s - %s", name, ippErrorString(cupsLastError())); httpClose(http); return (0); @@ -166,7 +166,7 @@ cups_printername_ok(char *name) /* I - Name of printer */ if (response->request.status.status_code >= IPP_OK_CONFLICT) { - LOG(log_error, logtype_papd, "Unable to get printer status for %s - %s\n", name, + LOG(log_error, logtype_papd, "Unable to get printer status for %s - %s", name, ippErrorString(response->request.status.status_code)); ippDelete(response); return (0); @@ -218,7 +218,7 @@ cups_get_printer_status (struct printer *pr) if ((http = httpConnect(cupsServer(), ippPort())) == NULL) { - LOG(log_error, logtype_papd, "Unable to connect to CUPS server %s - %s\n", + LOG(log_error, logtype_papd, "Unable to connect to CUPS server %s - %s", cupsServer(), strerror(errno)); return (0); } @@ -268,7 +268,7 @@ cups_get_printer_status (struct printer *pr) if ((response = cupsDoRequest(http, request, "/")) == NULL) { - LOG(log_error, logtype_papd, "Unable to get printer status for %s - %s\n", pr->p_printer, + LOG(log_error, logtype_papd, "Unable to get printer status for %s - %s", pr->p_printer, ippErrorString(cupsLastError())); httpClose(http); return (0); @@ -276,7 +276,7 @@ cups_get_printer_status (struct printer *pr) if (response->request.status.status_code >= IPP_OK_CONFLICT) { - LOG(log_error, logtype_papd, "Unable to get printer status for %s - %s\n", pr->p_printer, + LOG(log_error, logtype_papd, "Unable to get printer status for %s - %s", pr->p_printer, ippErrorString(response->request.status.status_code)); ippDelete(response); httpClose(http); @@ -357,7 +357,7 @@ int cups_print_job ( char * name, char *filename, char *job, char *username, cha strlcat ( filepath , filename, sizeof(filepath)); if ((jobid = cupsPrintFile( name, filepath, job, 0, options)) == 0) - LOG(log_error, logtype_papd, "Unable to print job '%s' (%s) to printer '%s' for user '%s' - CUPS error : '%s'\n", job, filepath, name, username, ippErrorString(cupsLastError())); + LOG(log_error, logtype_papd, "Unable to print job '%s' (%s) to printer '%s' for user '%s' - CUPS error : '%s'", job, filepath, name, username, ippErrorString(cupsLastError())); else LOG(log_info, logtype_papd, "Job '%s' queued to printer '%s' with id '%d'", job, name, jobid); diff --git a/libatalk/dsi/dsi_tcp.c b/libatalk/dsi/dsi_tcp.c index 4fe5e4c2..ae82820e 100644 --- a/libatalk/dsi/dsi_tcp.c +++ b/libatalk/dsi/dsi_tcp.c @@ -1,5 +1,5 @@ /* - * $Id: dsi_tcp.c,v 1.9.10.7 2004-05-04 15:38:26 didg Exp $ + * $Id: dsi_tcp.c,v 1.9.10.7.2.1 2005-01-11 23:00:42 didg Exp $ * * Copyright (c) 1997, 1998 Adrian Sun (asun@zoology.washington.edu) * All rights reserved. See COPYRIGHT. @@ -335,8 +335,8 @@ int dsi_tcp_init(DSI *dsi, const char *hostname, const char *address, inet_ntoa(dsi->server.sin_addr), ifr.ifr_name); goto iflist_done; } - LOG(log_info, logtype_default, "dsi_tcp (Chooser will not select afp/tcp)\n\ -Check to make sure %s is in /etc/hosts and the correct domain is in\n\ + LOG(log_info, logtype_default, "dsi_tcp (Chooser will not select afp/tcp) \ +Check to make sure %s is in /etc/hosts and the correct domain is in \ /etc/resolv.conf: %s", hostname, strerror(errno)); iflist_done: diff --git a/libatalk/util/fault.c b/libatalk/util/fault.c index a6f3aab6..7ef4fb8a 100644 --- a/libatalk/util/fault.c +++ b/libatalk/util/fault.c @@ -102,7 +102,7 @@ static void smb_panic(const char *why) extern unsigned int global_clobber_region_line; if (global_clobber_region_function) { - DEBUG(0,("smb_panic: clobber_region() last called from [%s(%u)]\n", + DEBUG(0,("smb_panic: clobber_region() last called from [%s(%u)]", global_clobber_region_function, global_clobber_region_line)); } -- 2.39.2