From: srittau Date: Wed, 14 Nov 2001 21:45:12 +0000 (+0000) Subject: %m -> %s strerror(errno) (Warnings) X-Git-Tag: netatalk-1-5-rc1~45 X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=a3f338df0c8ffad5f349390f97dff0910ebd3ee6 %m -> %s strerror(errno) (Warnings) --- diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c index 3a68866f..98ae7fc9 100644 --- a/etc/afpd/afp_dsi.c +++ b/etc/afpd/afp_dsi.c @@ -1,5 +1,5 @@ /* - * $Id: afp_dsi.c,v 1.8 2001-06-20 18:33:04 rufustfirefly Exp $ + * $Id: afp_dsi.c,v 1.9 2001-11-14 21:45:12 srittau Exp $ * * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu) * Copyright (c) 1990,1993 Regents of The University of Michigan. @@ -16,6 +16,7 @@ #include #include #include +#include #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ @@ -95,7 +96,7 @@ static void afp_dsi_timedown() it.it_value.tv_sec = 300; it.it_value.tv_usec = 0; if ( setitimer( ITIMER_REAL, &it, 0 ) < 0 ) { - syslog( LOG_ERR, "afp_timedown: setitimer: %m" ); + syslog( LOG_ERR, "afp_timedown: setitimer: %s", strerror(errno) ); afp_dsi_die(1); } @@ -106,7 +107,7 @@ static void afp_dsi_timedown() sigaddset(&sv.sa_mask, SIGTERM); sv.sa_flags = SA_RESTART; if ( sigaction( SIGALRM, &sv, 0 ) < 0 ) { - syslog( LOG_ERR, "afp_timedown: sigaction: %m" ); + syslog( LOG_ERR, "afp_timedown: sigaction: %s", strerror(errno) ); afp_dsi_die(1); } } @@ -154,7 +155,7 @@ void afp_over_dsi(AFPObj *obj) sigaddset(&action.sa_mask, SIGTERM); action.sa_flags = SA_RESTART; if ( sigaction( SIGHUP, &action, 0 ) < 0 ) { - syslog( LOG_ERR, "afp_over_dsi: sigaction: %m" ); + syslog( LOG_ERR, "afp_over_dsi: sigaction: %s", strerror(errno) ); afp_dsi_die(1); } @@ -164,7 +165,7 @@ void afp_over_dsi(AFPObj *obj) sigaddset(&action.sa_mask, SIGHUP); action.sa_flags = SA_RESTART; if ( sigaction( SIGTERM, &action, 0 ) < 0 ) { - syslog( LOG_ERR, "afp_over_dsi: sigaction: %m" ); + syslog( LOG_ERR, "afp_over_dsi: sigaction: %s", strerror(errno) ); afp_dsi_die(1); } @@ -175,7 +176,7 @@ void afp_over_dsi(AFPObj *obj) sigaddset(&action.sa_mask, SIGUSR2); action.sa_flags = SA_RESTART; if ( sigaction( SIGUSR2, &action, 0) < 0 ) { - syslog( LOG_ERR, "afp_over_dsi: sigaction: %m" ); + syslog( LOG_ERR, "afp_over_dsi: sigaction: %s", strerror(errno) ); afp_dsi_die(1); } #endif /* SERVERTEXT */ @@ -216,7 +217,7 @@ void afp_over_dsi(AFPObj *obj) #ifdef AFS if ( writtenfork ) { if ( flushfork( writtenfork ) < 0 ) { - syslog( LOG_ERR, "main flushfork: %m" ); + syslog( LOG_ERR, "main flushfork: %s", strerror(errno) ); } writtenfork = NULL; } @@ -255,7 +256,7 @@ void afp_over_dsi(AFPObj *obj) } if (!dsi_cmdreply(dsi, err)) { - syslog(LOG_ERR, "dsi_cmdreply(%d): %m", dsi->socket); + syslog(LOG_ERR, "dsi_cmdreply(%d): %s", dsi->socket, strerror(errno) ); afp_dsi_die(1); } break; @@ -285,7 +286,7 @@ void afp_over_dsi(AFPObj *obj) } if (!dsi_wrtreply(dsi, err)) { - syslog( LOG_ERR, "dsi_wrtreply: %m" ); + syslog( LOG_ERR, "dsi_wrtreply: %s", strerror(errno) ); afp_dsi_die(1); } break; diff --git a/etc/afpd/fork.c b/etc/afpd/fork.c index f38c4380..d56c967e 100644 --- a/etc/afpd/fork.c +++ b/etc/afpd/fork.c @@ -1,5 +1,5 @@ /* - * $Id: fork.c,v 1.9 2001-10-24 04:13:22 jmarcus Exp $ + * $Id: fork.c,v 1.10 2001-11-14 21:45:12 srittau Exp $ * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -562,7 +562,7 @@ int afp_setforkparams(obj, ibuf, ibuflen, rbuf, rbuflen ) #ifdef AFS if ( flushfork( ofork ) < 0 ) { - syslog( LOG_ERR, "afp_setforkparams: flushfork: %m" ); + syslog( LOG_ERR, "afp_setforkparams: flushfork: %s", strerror(errno) ); } #endif /* AFS */ @@ -1016,8 +1016,8 @@ int flushfork( ofork ) err = -1; if (err < 0) - syslog( LOG_ERR, "flushfork: hfile(%d) %m", - ad_hfileno(ofork->of_ad) ); + syslog( LOG_ERR, "flushfork: hfile(%d) %s", + ad_hfileno(ofork->of_ad), strerror(errno) ); } return( err ); @@ -1038,7 +1038,7 @@ int afp_closefork(obj, ibuf, ibuflen, rbuf, rbuflen ) memcpy(&ofrefnum, ibuf, sizeof( ofrefnum )); if (( ofork = of_find( ofrefnum )) == NULL ) { - syslog( LOG_ERR, "afp_closefork: of_find: %m" ); + syslog( LOG_ERR, "afp_closefork: of_find: %s", strerrro(errno) ); return( AFPERR_PARAM ); } @@ -1074,7 +1074,7 @@ int afp_closefork(obj, ibuf, ibuflen, rbuf, rbuflen ) } if ( ad_close( ofork->of_ad, adflags ) < 0 ) { - syslog( LOG_ERR, "afp_closefork: ad_close: %m" ); + syslog( LOG_ERR, "afp_closefork: ad_close: %s", strerror(errno) ); return( AFPERR_PARAM ); } @@ -1111,7 +1111,7 @@ static __inline__ ssize_t write_file(struct ofork *ofork, int eid, case ENOSPC : return( AFPERR_DFULL ); default : - syslog( LOG_ERR, "afp_write: ad_write: %m" ); + syslog( LOG_ERR, "afp_write: ad_write: %s", strerror(errno) ); return( AFPERR_PARAM ); } } @@ -1147,7 +1147,7 @@ int afp_write(obj, ibuf, ibuflen, rbuf, rbuflen) ibuf += sizeof( reqcount ); if (( ofork = of_find( ofrefnum )) == NULL ) { - syslog( LOG_ERR, "afp_write: of_find: %m" ); + syslog( LOG_ERR, "afp_write: of_find: %s", strerror(errno) ); err = AFPERR_PARAM; goto afp_write_err; } @@ -1207,7 +1207,7 @@ int afp_write(obj, ibuf, ibuflen, rbuf, rbuflen) case AFPPROTO_ASP: if (asp_wrtcont(obj->handle, rbuf, rbuflen) < 0) { *rbuflen = 0; - syslog( LOG_ERR, "afp_write: asp_wrtcont: %m" ); + syslog( LOG_ERR, "afp_write: asp_wrtcont: %s", strerror(errno) ); return( AFPERR_PARAM ); } @@ -1252,7 +1252,7 @@ int afp_write(obj, ibuf, ibuflen, rbuf, rbuflen) cc = AFPERR_DFULL; break; default : - syslog( LOG_ERR, "afp_write: ad_writefile: %m" ); + syslog( LOG_ERR, "afp_write: ad_writefile: %s", strerror(errno) ); goto afp_write_loop; } dsi_writeflush(dsi); @@ -1332,7 +1332,7 @@ int afp_getforkparams(obj, ibuf, ibuflen, rbuf, rbuflen ) *rbuflen = 0; if (( ofork = of_find( ofrefnum )) == NULL ) { - syslog( LOG_ERR, "afp_getforkparams: of_find: %m" ); + syslog( LOG_ERR, "afp_getforkparams: of_find: %s", strerror(errno) ); return( AFPERR_PARAM ); }