From 06beeeeef1a9a833a03a0aa01848a78a35c90330 Mon Sep 17 00:00:00 2001 From: didg Date: Thu, 29 Oct 2009 12:58:11 +0000 Subject: [PATCH] remove redundant debug output, it's already print in afp_dsi --- etc/afpd/file.c | 57 +--------------------------------------------- etc/afpd/filedir.c | 41 +-------------------------------- 2 files changed, 2 insertions(+), 96 deletions(-) diff --git a/etc/afpd/file.c b/etc/afpd/file.c index ca1d3d3c..da4fddcf 100644 --- a/etc/afpd/file.c +++ b/etc/afpd/file.c @@ -1,5 +1,5 @@ /* - * $Id: file.c,v 1.116 2009-10-27 23:35:17 didg Exp $ + * $Id: file.c,v 1.117 2009-10-29 12:58:11 didg Exp $ * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -575,10 +575,6 @@ int afp_createfile(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, u_int16_t vid; struct path *s_path; -#ifdef DEBUG - LOG(log_info, logtype_afpd, "begin afp_createfile:"); -#endif /* DEBUG */ - *rbuflen = 0; ibuf++; creatf = (unsigned char) *ibuf++; @@ -680,10 +676,6 @@ createfile_done: setvoltime(obj, vol ); -#ifdef DEBUG - LOG(log_info, logtype_afpd, "end afp_createfile"); -#endif /* DEBUG */ - return (retvalue); } @@ -695,10 +687,6 @@ int afp_setfilparams(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_ int did, rc; u_int16_t vid, bitmap; -#ifdef DEBUG - LOG(log_info, logtype_afpd, "begin afp_setfilparams:"); -#endif /* DEBUG */ - *rbuflen = 0; ibuf += 2; @@ -741,10 +729,6 @@ int afp_setfilparams(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_ setvoltime(obj, vol ); } -#ifdef DEBUG - LOG(log_info, logtype_afpd, "end afp_setfilparams:"); -#endif /* DEBUG */ - return( rc ); } @@ -1160,10 +1144,6 @@ int afp_copyfile(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, si struct adouble ad, *adp; int denyreadset; -#ifdef DEBUG - LOG(log_info, logtype_afpd, "begin afp_copyfile:"); -#endif /* DEBUG */ - *rbuflen = 0; ibuf += 2; @@ -1261,10 +1241,6 @@ int afp_copyfile(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, si setvoltime(obj, d_vol ); -#ifdef DEBUG - LOG(log_info, logtype_afpd, "end afp_copyfile:"); -#endif /* DEBUG */ - return( retvalue ); } @@ -1609,10 +1585,6 @@ int afp_createid(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, si u_short vid; struct path *s_path; -#ifdef DEBUG - LOG(log_info, logtype_afpd, "begin afp_createid:"); -#endif /* DEBUG */ - *rbuflen = 0; ibuf += 2; @@ -1671,9 +1643,6 @@ int afp_createid(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, si return AFP_OK; } -#ifdef DEBUG - LOG(log_info, logtype_afpd, "ending afp_createid...:"); -#endif /* DEBUG */ return afp_errno; } @@ -1773,10 +1742,6 @@ int afp_resolveid(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, s static char buffer[12 + MAXPATHLEN + 1]; int len = 12 + MAXPATHLEN + 1; -#ifdef DEBUG - LOG(log_info, logtype_afpd, "begin afp_resolveid:"); -#endif /* DEBUG */ - *rbuflen = 0; ibuf += 2; @@ -1865,10 +1830,6 @@ retry: *rbuflen = buflen + sizeof(bitmap); memcpy(rbuf, ibuf, sizeof(bitmap)); -#ifdef DEBUG - LOG(log_info, logtype_afpd, "end afp_resolveid:"); -#endif /* DEBUG */ - return AFP_OK; } @@ -1886,10 +1847,6 @@ int afp_deleteid(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf _U_ static char buffer[12 + MAXPATHLEN + 1]; int len = 12 + MAXPATHLEN + 1; -#ifdef DEBUG - LOG(log_info, logtype_afpd, "begin afp_deleteid:"); -#endif /* DEBUG */ - *rbuflen = 0; ibuf += 2; @@ -1951,10 +1908,6 @@ int afp_deleteid(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf _U_ } } -#ifdef DEBUG - LOG(log_info, logtype_afpd, "end afp_deleteid:"); -#endif /* DEBUG */ - return err; } @@ -2031,10 +1984,6 @@ int afp_exchangefiles(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U uid_t uid; gid_t gid; -#ifdef DEBUG - LOG(log_info, logtype_afpd, "begin afp_exchangefiles:"); -#endif /* DEBUG */ - *rbuflen = 0; ibuf += 2; @@ -2238,10 +2187,6 @@ int afp_exchangefiles(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U exit(EXITERR_SYS); } -#ifdef DEBUG - LOG(log_info, logtype_afpd, "ending afp_exchangefiles:"); -#endif /* DEBUG */ - err = AFP_OK; goto err_exchangefile; diff --git a/etc/afpd/filedir.c b/etc/afpd/filedir.c index d6923f77..f5ce7fbc 100644 --- a/etc/afpd/filedir.c +++ b/etc/afpd/filedir.c @@ -1,5 +1,5 @@ /* - * $Id: filedir.c,v 1.61 2009-10-27 23:35:17 didg Exp $ + * $Id: filedir.c,v 1.62 2009-10-29 12:58:11 didg Exp $ * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -141,10 +141,6 @@ int afp_getfildirparams(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *r u_int16_t fbitmap, dbitmap, vid; struct path *s_path; -#ifdef DEBUG - LOG(log_info, logtype_afpd, "begin afp_getfildirparams:"); -#endif /* DEBUG */ - *rbuflen = 0; ibuf += 2; @@ -219,10 +215,6 @@ int afp_getfildirparams(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *r rbuf += sizeof( dbitmap ) + sizeof( u_char ); *rbuf = 0; -#ifdef DEBUG - LOG(log_info, logtype_afpd, "end afp_getfildirparams:"); -#endif /* DEBUG */ - return( AFP_OK ); } @@ -235,10 +227,6 @@ int afp_setfildirparams(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf u_int16_t vid, bitmap; int did, rc; -#ifdef DEBUG - LOG(log_info, logtype_afpd, "begin afp_setfildirparams:"); -#endif /* DEBUG */ - *rbuflen = 0; ibuf += 2; memcpy( &vid, ibuf, sizeof(vid)); @@ -293,10 +281,6 @@ int afp_setfildirparams(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf setvoltime(obj, vol ); } -#ifdef DEBUG - LOG(log_info, logtype_afpd, "end afp_setfildirparams:"); -#endif /* DEBUG */ - return( rc ); } @@ -446,9 +430,6 @@ int afp_rename(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size u_int16_t vid; int isdir = 0; int rc; -#ifdef DEBUG - LOG(log_info, logtype_afpd, "begin afp_rename:"); -#endif /* DEBUG */ *rbuflen = 0; ibuf += 2; @@ -510,10 +491,6 @@ int afp_rename(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size setvoltime(obj, vol ); } -#ifdef DEBUG - LOG(log_info, logtype_afpd, "end afp_rename:"); -#endif /* DEBUG */ - return( rc ); } @@ -527,10 +504,6 @@ int afp_delete(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size int did, rc; u_int16_t vid; -#ifdef DEBUG - LOG(log_info, logtype_afpd, "begin afp_delete:"); -#endif /* DEBUG */ - *rbuflen = 0; ibuf += 2; @@ -580,10 +553,6 @@ int afp_delete(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size setvoltime(obj, vol ); } -#ifdef DEBUG - LOG(log_info, logtype_afpd, "end afp_delete:"); -#endif /* DEBUG */ - return( rc ); } /* ------------------------ */ @@ -651,10 +620,6 @@ int afp_moveandrename(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U int retvalue; #endif /* DROPKLUDGE */ -#ifdef DEBUG - LOG(log_info, logtype_afpd, "begin afp_moveandrename:"); -#endif /* DEBUG */ - *rbuflen = 0; ibuf += 2; @@ -746,10 +711,6 @@ int afp_moveandrename(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U setvoltime(obj, vol ); } -#ifdef DEBUG - LOG(log_info, logtype_afpd, "end afp_moveandrename:"); -#endif /* DEBUG */ - return( rc ); } -- 2.39.2