From 44aa32affa2c16524ca5cca5d322922a8862f935 Mon Sep 17 00:00:00 2001 From: didg Date: Thu, 29 Oct 2009 13:38:15 +0000 Subject: [PATCH] use log_debug9 rather than log_debug for LOG inside ifdef DEBUG --- etc/afpd/desktop.c | 6 ++--- etc/afpd/file.c | 28 ++++++++++++------------ etc/afpd/filedir.c | 10 ++++----- etc/afpd/messages.c | 12 +++++----- etc/papd/headers.c | 12 +++++----- etc/papd/lp.c | 18 +++++++-------- etc/papd/main.c | 4 ++-- libatalk/acl/uuid.c | 4 ++-- libatalk/adouble/ad_open.c | 6 ++--- libatalk/cnid/cdb/cnid_cdb_add.c | 8 +++---- libatalk/cnid/cdb/cnid_cdb_delete.c | 4 ++-- libatalk/cnid/cdb/cnid_cdb_get.c | 4 ++-- libatalk/cnid/cdb/cnid_cdb_lookup.c | 4 ++-- libatalk/cnid/cdb/cnid_cdb_rebuild_add.c | 6 ++--- libatalk/cnid/cdb/cnid_cdb_resolve.c | 4 ++-- libatalk/cnid/db3/cnid_db3_add.c | 12 +++++----- libatalk/cnid/db3/cnid_db3_close.c | 4 ++-- libatalk/cnid/db3/cnid_db3_delete.c | 6 ++--- libatalk/cnid/db3/cnid_db3_get.c | 4 ++-- libatalk/cnid/db3/cnid_db3_lookup.c | 8 +++---- libatalk/cnid/db3/cnid_db3_resolve.c | 4 ++-- libatalk/unicode/charcnv.c | 4 ++-- 22 files changed, 86 insertions(+), 86 deletions(-) diff --git a/etc/afpd/desktop.c b/etc/afpd/desktop.c index d29aa92e..9850dfc0 100644 --- a/etc/afpd/desktop.c +++ b/etc/afpd/desktop.c @@ -1,5 +1,5 @@ /* - * $Id: desktop.c,v 1.44 2009-10-27 23:35:17 didg Exp $ + * $Id: desktop.c,v 1.45 2009-10-29 13:38:15 didg Exp $ * * See COPYRIGHT. * @@ -635,7 +635,7 @@ char *mtoupath(const struct vol *vol, char *mpath, cnid_t did, int utf8) } #ifdef DEBUG - LOG(log_debug, logtype_afpd, "mtoupath: '%s':'%s'", mpath, upath); + LOG(log_debug9, logtype_afpd, "mtoupath: '%s':'%s'", mpath, upath); #endif /* DEBUG */ return( upath ); } @@ -681,7 +681,7 @@ char *utompath(const struct vol *vol, char *upath, cnid_t id, int utf8) m = mangle(vol, mpath, outlen, upath, id, flags); #ifdef DEBUG - LOG(log_debug, logtype_afpd, "utompath: '%s':'%s':'%2.2X'", upath, m, ntohl(id)); + LOG(log_debug9, logtype_afpd, "utompath: '%s':'%s':'%2.2X'", upath, m, ntohl(id)); #endif /* DEBUG */ return(m); diff --git a/etc/afpd/file.c b/etc/afpd/file.c index 05004642..8741882d 100644 --- a/etc/afpd/file.c +++ b/etc/afpd/file.c @@ -1,5 +1,5 @@ /* - * $Id: file.c,v 1.118 2009-10-29 13:17:28 didg Exp $ + * $Id: file.c,v 1.119 2009-10-29 13:38:15 didg Exp $ * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -253,7 +253,7 @@ int getmetadata(struct vol *vol, struct maccess ma; #ifdef DEBUG - LOG(log_debug, logtype_afpd, "begin getmetadata:"); + LOG(log_debug9, logtype_afpd, "begin getmetadata:"); #endif /* DEBUG */ upath = path->u_name; @@ -520,7 +520,7 @@ int getfilparams(struct vol *vol, int rc; #ifdef DEBUG - LOG(log_debug, logtype_default, "begin getfilparams:"); + LOG(log_debug9, logtype_default, "begin getfilparams:"); #endif /* DEBUG */ opened = PARAM_NEED_ADP(bitmap); @@ -557,7 +557,7 @@ int getfilparams(struct vol *vol, ad_close_metadata( adp); } #ifdef DEBUG - LOG(log_debug, logtype_afpd, "end getfilparams:"); + LOG(log_debug9, logtype_afpd, "end getfilparams:"); #endif /* DEBUG */ return( rc ); @@ -764,7 +764,7 @@ int setfilparams(struct vol *vol, u_char finder_buf[32]; #ifdef DEBUG - LOG(log_debug, logtype_afpd, "begin setfilparams:"); + LOG(log_debug9, logtype_afpd, "begin setfilparams:"); #endif /* DEBUG */ upath = path->u_name; @@ -971,7 +971,7 @@ setfilparam_done: } #ifdef DEBUG - LOG(log_debug, logtype_afpd, "end setfilparams:"); + LOG(log_debug9, logtype_afpd, "end setfilparams:"); #endif /* DEBUG */ return err; } @@ -991,7 +991,7 @@ int renamefile(const struct vol *vol, char *src, char *dst, char *newname, struc int rc; #ifdef DEBUG - LOG(log_debug, logtype_afpd, "begin renamefile:"); + LOG(log_debug9, logtype_afpd, "begin renamefile:"); #endif /* DEBUG */ if ( unix_rename( src, dst ) < 0 ) { @@ -1054,7 +1054,7 @@ int renamefile(const struct vol *vol, char *src, char *dst, char *newname, struc ad_close( adp, ADFLAGS_HF ); } #ifdef DEBUG - LOG(log_debug, logtype_afpd, "end renamefile:"); + LOG(log_debug9, logtype_afpd, "end renamefile:"); #endif /* DEBUG */ return( AFP_OK ); @@ -1251,7 +1251,7 @@ static int copy_all(const int dfd, const void *buf, ssize_t cc; #ifdef DEBUG - LOG(log_debug, logtype_afpd, "begin copy_all:"); + LOG(log_debug9, logtype_afpd, "begin copy_all:"); #endif /* DEBUG */ while (buflen > 0) { @@ -1267,7 +1267,7 @@ static int copy_all(const int dfd, const void *buf, } #ifdef DEBUG - LOG(log_debug, logtype_afpd, "end copy_all:"); + LOG(log_debug9, logtype_afpd, "end copy_all:"); #endif /* DEBUG */ return 0; @@ -1358,7 +1358,7 @@ int copyfile(const struct vol *s_vol, const struct vol*d_vol, struct stat st; #ifdef DEBUG - LOG(log_debug, logtype_afpd, "begin copyfile:"); + LOG(log_debug9, logtype_afpd, "begin copyfile:"); #endif /* DEBUG */ if (adp == NULL) { @@ -1439,7 +1439,7 @@ int copyfile(const struct vol *s_vol, const struct vol*d_vol, } #ifdef DEBUG - LOG(log_debug, logtype_afpd, "end copyfile:"); + LOG(log_debug9, logtype_afpd, "end copyfile:"); #endif /* DEBUG */ done: @@ -1496,7 +1496,7 @@ int deletefile(const struct vol *vol, char *file, int checkAttrib) int adflags, err = AFP_OK; #ifdef DEBUG - LOG(log_debug, logtype_afpd, "begin deletefile:"); + LOG(log_debug9, logtype_afpd, "begin deletefile:"); #endif /* DEBUG */ /* try to open both forks at once */ @@ -1566,7 +1566,7 @@ int deletefile(const struct vol *vol, char *file, int checkAttrib) ad_close( &ad, adflags ); /* ad_close removes locks if any */ #ifdef DEBUG - LOG(log_debug, logtype_afpd, "end deletefile:"); + LOG(log_debug9, logtype_afpd, "end deletefile:"); #endif /* DEBUG */ return err; diff --git a/etc/afpd/filedir.c b/etc/afpd/filedir.c index fcc13a41..8930293c 100644 --- a/etc/afpd/filedir.c +++ b/etc/afpd/filedir.c @@ -1,5 +1,5 @@ /* - * $Id: filedir.c,v 1.63 2009-10-29 13:17:28 didg Exp $ + * $Id: filedir.c,v 1.64 2009-10-29 13:38:15 didg Exp $ * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -66,8 +66,8 @@ more information */ uid_t uid; int ret = AFP_OK; #ifdef DEBUG - LOG(log_debug, logtype_afpd, "begin matchfile2dirperms:"); -#endif /* DEBUG */ + LOG(log_debug9, logtype_afpd, "begin matchfile2dirperms:"); +#endif if (stat(upath, &st ) < 0) { LOG(log_error, logtype_afpd, "Could not stat %s: %s", upath, strerror(errno)); @@ -124,8 +124,8 @@ more information */ } /* end else if stat success */ #ifdef DEBUG - LOG(log_debug, logtype_afpd, "end matchfile2dirperms:"); -#endif /* DEBUG */ + LOG(log_debug9, logtype_afpd, "end matchfile2dirperms:"); +#endif return ret; } #endif diff --git a/etc/afpd/messages.c b/etc/afpd/messages.c index 54540a7a..164bb200 100644 --- a/etc/afpd/messages.c +++ b/etc/afpd/messages.c @@ -1,5 +1,5 @@ /* - * $Id: messages.c,v 1.21 2009-10-22 05:53:20 didg Exp $ + * $Id: messages.c,v 1.22 2009-10-29 13:38:15 didg Exp $ * * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu) * All Rights Reserved. See COPYRIGHT. @@ -59,8 +59,8 @@ void readmessage(AFPObj *obj) sprintf(filename, "%s/message.%d", SERVERTEXT, getpid()); #ifdef DEBUG - LOG(log_debug, logtype_afpd, "Reading file %s ", filename); -#endif /* DEBUG */ + LOG(log_debug9, logtype_afpd, "Reading file %s ", filename); +#endif message=fopen(filename, "r"); if (message==NULL) { @@ -103,11 +103,11 @@ void readmessage(AFPObj *obj) } #ifdef DEBUG else { - LOG(log_info, logtype_afpd, "Deleted %s", filename); + LOG(log_debug9, logtype_afpd, "Deleted %s", filename); } - LOG(log_info, logtype_afpd, "Set server message to \"%s\"", servermesg); -#endif /* DEBUG */ + LOG(log_debug9, logtype_afpd, "Set server message to \"%s\"", servermesg); +#endif } free(filename); #endif /* SERVERTEXT */ diff --git a/etc/papd/headers.c b/etc/papd/headers.c index 68e7294c..dd315396 100644 --- a/etc/papd/headers.c +++ b/etc/papd/headers.c @@ -1,5 +1,5 @@ /* - * $Id: headers.c,v 1.13 2009-10-13 22:55:37 didg Exp $ + * $Id: headers.c,v 1.14 2009-10-29 13:38:15 didg Exp $ * * Copyright (c) 1990,1994 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -128,7 +128,7 @@ int ch_title( struct papfile *in, struct papfile *out _U_) } #ifdef DEBUG - LOG(log_debug, logtype_papd, "Parsing %%Title"); + LOG(log_debug9, logtype_papd, "Parsing %%Title"); #endif cmt = get_text(start, linelength); @@ -195,7 +195,7 @@ int ch_endcomm( struct papfile *in, struct papfile *out _U_) int linelength, crlflength; #ifdef DEBUG - LOG(log_debug, logtype_papd, "End Comment"); + LOG(log_debug9, logtype_papd, "End Comment"); #endif in->pf_state |= PF_STW; @@ -224,7 +224,7 @@ int ch_starttranslate( struct papfile *in, struct papfile *out _U_) int linelength, crlflength; #ifdef DEBUG - LOG(log_debug, logtype_papd, "Start translate"); + LOG(log_debug9, logtype_papd, "Start translate"); #endif switch ( markline( in, &start, &linelength, &crlflength )) { @@ -251,7 +251,7 @@ int ch_endtranslate(struct papfile *in, struct papfile *out _U_) int linelength, crlflength; #ifdef DEBUG - LOG(log_debug, logtype_papd, "EndTranslate"); + LOG(log_debug9, logtype_papd, "EndTranslate"); #endif switch ( markline( in, &start, &linelength, &crlflength )) { @@ -278,7 +278,7 @@ int ch_translateone( struct papfile *in, struct papfile *out _U_) int linelength, crlflength; #ifdef DEBUG - LOG(log_debug, logtype_papd, "TranslateOne"); + LOG(log_debug9, logtype_papd, "TranslateOne"); #endif switch ( markline( in, &start, &linelength, &crlflength )) { diff --git a/etc/papd/lp.c b/etc/papd/lp.c index e077a8d5..d315b12f 100644 --- a/etc/papd/lp.c +++ b/etc/papd/lp.c @@ -1,5 +1,5 @@ /* - * $Id: lp.c,v 1.32 2009-10-29 11:35:58 didg Exp $ + * $Id: lp.c,v 1.33 2009-10-29 13:38:15 didg Exp $ * * Copyright (c) 1990,1994 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -188,19 +188,19 @@ static void lp_setup_comments (charset_t dest) if (lp.lp_job) { #ifdef DEBUG1 - LOG(log_debug, logtype_papd, "job: %s", lp.lp_job ); + LOG(log_debug9, logtype_papd, "job: %s", lp.lp_job ); #endif translate(from, dest, &lp.lp_job); } if (lp.lp_created_for) { #ifdef DEBUG1 - LOG(log_debug, logtype_papd, "for: %s", lp.lp_created_for ); + LOG(log_debug9, logtype_papd, "for: %s", lp.lp_created_for ); #endif translate(from, dest, &lp.lp_created_for); } if (lp.lp_person) { #ifdef DEBUG1 - LOG(log_debug, logtype_papd, "person: %s", lp.lp_person ); + LOG(log_debug9, logtype_papd, "person: %s", lp.lp_person ); #endif translate(from, dest, &lp.lp_person); } @@ -361,7 +361,7 @@ void lp_job(char *job) lp.lp_job = strdup(job); #ifdef DEBUG - LOG(log_debug, logtype_papd, "job: %s", lp.lp_job ); + LOG(log_debug9, logtype_papd, "job: %s", lp.lp_job ); #endif } @@ -546,7 +546,7 @@ int lp_open(struct papfile *out, struct sockaddr_at *sat) struct passwd *pwent; #ifdef DEBUG - LOG (log_debug, logtype_papd, "lp_open"); + LOG (log_debug9, logtype_papd, "lp_open"); #endif if ( lp.lp_flags & LP_JOBPENDING ) { @@ -632,7 +632,7 @@ int lp_open(struct papfile *out, struct sockaddr_at *sat) return( -1 ); } #ifdef DEBUG - LOG(log_debug, logtype_papd, "lp_open: opened %s", name ); + LOG(log_debug9, logtype_papd, "lp_open: opened %s", name ); #endif } lp.lp_flags |= LP_OPEN; @@ -685,7 +685,7 @@ int lp_write(struct papfile *in, char *buf, size_t len) tbuf = tempbuf2; last_line_translated = 1; #ifdef DEBUG - LOG(log_debug, logtype_papd, "lp_write: %s", tbuf ); + LOG(log_debug9, logtype_papd, "lp_write: %s", tbuf ); #endif } else { @@ -706,7 +706,7 @@ int lp_write(struct papfile *in, char *buf, size_t len) * %%EndComment triggers writing to file */ if (( lp.lp_flags & LP_OPEN ) == 0 ) { #ifdef DEBUG - LOG(log_debug, logtype_papd, "lp_write: writing to temporary buffer" ); + LOG(log_debug9, logtype_papd, "lp_write: writing to temporary buffer" ); #endif if ((bufpos+len) > BUFSIZE) { LOG(log_error, logtype_papd, "lp_write: temporary buffer too small" ); diff --git a/etc/papd/main.c b/etc/papd/main.c index 159f616d..d0c46451 100644 --- a/etc/papd/main.c +++ b/etc/papd/main.c @@ -1,5 +1,5 @@ /* - * $Id: main.c,v 1.30 2009-10-29 11:35:58 didg Exp $ + * $Id: main.c,v 1.31 2009-10-29 13:38:15 didg Exp $ * * Copyright (c) 1990,1995 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -404,7 +404,7 @@ int main(int ac, char **av) * 0xffff to indicate we're busy */ #ifdef DEBUG - LOG(log_debug, logtype_papd, "CUPS: PAP_OPEN"); + LOG(log_debug9, logtype_papd, "CUPS: PAP_OPEN"); #endif if ( (pr->p_flags & P_SPOOLED) && (cups_get_printer_status ( pr ) == 0)) { LOG(log_error, logtype_papd, "CUPS_PAP_OPEN: %s is not accepting jobs", diff --git a/libatalk/acl/uuid.c b/libatalk/acl/uuid.c index 700120b5..6075a5c5 100644 --- a/libatalk/acl/uuid.c +++ b/libatalk/acl/uuid.c @@ -1,5 +1,5 @@ /* - $Id: uuid.c,v 1.1 2009-02-02 11:55:01 franklahm Exp $ + $Id: uuid.c,v 1.2 2009-10-29 13:38:15 didg Exp $ Copyright (c) 2008,2009 Frank Lahm This program is free software; you can redistribute it and/or modify @@ -131,7 +131,7 @@ int getnamefromuuid( uuidp_t uuidp, char **name, uuidtype_t *type) { if (ret == 0) { /* found in cache */ #ifdef DEBUG uuid_bin2string( uuidp, &uuid_string); - LOG(log_debug, logtype_afpd, "getnamefromuuid{cache}: UUID: %s -> name: %s, type:%s", uuid_string, *name, uuidtype[*type]); + LOG(log_debug9, logtype_afpd, "getnamefromuuid{cache}: UUID: %s -> name: %s, type:%s", uuid_string, *name, uuidtype[*type]); #endif } else { /* if not found in cache */ uuid_bin2string( uuidp, &uuid_string); diff --git a/libatalk/adouble/ad_open.c b/libatalk/adouble/ad_open.c index 64aef676..71c982c4 100644 --- a/libatalk/adouble/ad_open.c +++ b/libatalk/adouble/ad_open.c @@ -1,5 +1,5 @@ /* - * $Id: ad_open.c,v 1.53 2009-10-29 13:17:29 didg Exp $ + * $Id: ad_open.c,v 1.54 2009-10-29 13:38:16 didg Exp $ * * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu) * Copyright (c) 1990,1991 Regents of The University of Michigan. @@ -1064,8 +1064,8 @@ ad_mkdir( const char *path, int mode) struct stat stbuf; #ifdef DEBUG - LOG(log_debug, logtype_default, "ad_mkdir: Creating directory with mode %d", mode); -#endif /* DEBUG */ + LOG(log_debug9, logtype_default, "ad_mkdir: Creating directory with mode %d", mode); +#endif st_invalid = ad_mode_st(path, &mode, &stbuf); ret = mkdir( path, mode ); diff --git a/libatalk/cnid/cdb/cnid_cdb_add.c b/libatalk/cnid/cdb/cnid_cdb_add.c index eecce31d..774273c2 100644 --- a/libatalk/cnid/cdb/cnid_cdb_add.c +++ b/libatalk/cnid/cdb/cnid_cdb_add.c @@ -1,5 +1,5 @@ /* - * $Id: cnid_cdb_add.c,v 1.6 2009-10-29 13:17:29 didg Exp $ + * $Id: cnid_cdb_add.c,v 1.7 2009-10-29 13:38:16 didg Exp $ * * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu) * All Rights Reserved. See COPYRIGHT. @@ -186,7 +186,7 @@ cnid_t cnid_cdb_add(struct _cnid_db *cdb, const struct stat *st, /* ... Return id if it is valid, or if Rootinfo is read-only. */ if (id || (db->flags & CNIDFLAG_DB_RO)) { #ifdef DEBUG - LOG(log_debug, logtype_default, "cnid_add: Looked up did %u, name %s as %u", ntohl(did), name, ntohl(id)); + LOG(log_debug9, logtype_default, "cnid_add: Looked up did %u, name %s as %u", ntohl(did), name, ntohl(id)); #endif return id; } @@ -237,7 +237,7 @@ cnid_t cnid_cdb_add(struct _cnid_db *cdb, const struct stat *st, } #ifdef DEBUG - LOG(log_debug, logtype_default, "cnid_add: Returned CNID for did %u, name %s as %u", ntohl(did), name, ntohl(hint)); + LOG(log_debug9, logtype_default, "cnid_add: Returned CNID for did %u, name %s as %u", ntohl(did), name, ntohl(hint)); #endif return hint; @@ -286,7 +286,7 @@ int cnid_cdb_getstamp(struct _cnid_db *cdb, void *buffer, const size_t len) memcpy(buffer, (char*)data.data + CNID_DEV_OFS, len); #ifdef DEBUG - LOG(log_debug, logtype_cnid, "cnid_getstamp: Returning stamp"); + LOG(log_debug9, logtype_cnid, "cnid_getstamp: Returning stamp"); #endif return 0; } diff --git a/libatalk/cnid/cdb/cnid_cdb_delete.c b/libatalk/cnid/cdb/cnid_cdb_delete.c index ac232e47..e9503373 100644 --- a/libatalk/cnid/cdb/cnid_cdb_delete.c +++ b/libatalk/cnid/cdb/cnid_cdb_delete.c @@ -1,5 +1,5 @@ /* - * $Id: cnid_cdb_delete.c,v 1.3 2009-10-29 13:17:29 didg Exp $ + * $Id: cnid_cdb_delete.c,v 1.4 2009-10-29 13:38:16 didg Exp $ * * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu) * All Rights Reserved. See COPYRIGHT. @@ -37,7 +37,7 @@ int cnid_cdb_delete(struct _cnid_db *cdb, const cnid_t id) { } else { #ifdef DEBUG - LOG(log_debug, logtype_default, "cnid_delete: Deleting CNID %u", ntohl(id)); + LOG(log_debug9, logtype_default, "cnid_delete: Deleting CNID %u", ntohl(id)); #endif } return rc; diff --git a/libatalk/cnid/cdb/cnid_cdb_get.c b/libatalk/cnid/cdb/cnid_cdb_get.c index 7922a9ea..5ae4ea02 100644 --- a/libatalk/cnid/cdb/cnid_cdb_get.c +++ b/libatalk/cnid/cdb/cnid_cdb_get.c @@ -1,5 +1,5 @@ /* - * $Id: cnid_cdb_get.c,v 1.4 2009-10-29 13:17:29 didg Exp $ + * $Id: cnid_cdb_get.c,v 1.5 2009-10-29 13:38:16 didg Exp $ */ #ifdef HAVE_CONFIG_H @@ -46,7 +46,7 @@ cnid_t cnid_cdb_get(struct _cnid_db *cdb, const cnid_t did, char *name, memcpy(&id, data.data, sizeof(id)); #ifdef DEBUG - LOG(log_debug, logtype_default, "cnid_get: Returning CNID for %u, name %s as %u", + LOG(log_debug9, logtype_default, "cnid_get: Returning CNID for %u, name %s as %u", ntohl(did), name, ntohl(id)); #endif return id; diff --git a/libatalk/cnid/cdb/cnid_cdb_lookup.c b/libatalk/cnid/cdb/cnid_cdb_lookup.c index 4548a162..c3365534 100644 --- a/libatalk/cnid/cdb/cnid_cdb_lookup.c +++ b/libatalk/cnid/cdb/cnid_cdb_lookup.c @@ -1,5 +1,5 @@ /* - * $Id: cnid_cdb_lookup.c,v 1.4 2009-10-29 13:17:29 didg Exp $ + * $Id: cnid_cdb_lookup.c,v 1.5 2009-10-29 13:38:16 didg Exp $ */ #ifdef HAVE_CONFIG_H @@ -132,7 +132,7 @@ cnid_t cnid_cdb_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t cnid_cdb_update(cdb, id, st, did, name, len); #ifdef DEBUG - LOG(log_debug, logtype_default, "cnid_lookup: Looked up did %u, name %s, as %u (needed update)", ntohl(did), name, ntohl(id)); + LOG(log_debug9, logtype_default, "cnid_lookup: Looked up did %u, name %s, as %u (needed update)", ntohl(did), name, ntohl(id)); #endif return id; } diff --git a/libatalk/cnid/cdb/cnid_cdb_rebuild_add.c b/libatalk/cnid/cdb/cnid_cdb_rebuild_add.c index 8dc58240..af7cbb87 100644 --- a/libatalk/cnid/cdb/cnid_cdb_rebuild_add.c +++ b/libatalk/cnid/cdb/cnid_cdb_rebuild_add.c @@ -1,5 +1,5 @@ /* - * $Id: cnid_cdb_rebuild_add.c,v 1.4 2009-10-29 13:17:29 didg Exp $ + * $Id: cnid_cdb_rebuild_add.c,v 1.5 2009-10-29 13:38:16 didg Exp $ * * All Rights Reserved. See COPYRIGHT. * @@ -94,7 +94,7 @@ cnid_t cnid_cdb_rebuild_add(struct _cnid_db *cdb, const struct stat *st, /* ... Return id if it is valid, or if Rootinfo is read-only. */ if (id || (db->flags & CNIDFLAG_DB_RO)) { #ifdef DEBUG - LOG(log_debug, logtype_default, "cnid_add: Looked up did %u, name %s as %u", ntohl(did), name, ntohl(id)); + LOG(log_debug9, logtype_default, "cnid_add: Looked up did %u, name %s as %u", ntohl(did), name, ntohl(id)); #endif return id; } @@ -131,7 +131,7 @@ cnid_t cnid_cdb_rebuild_add(struct _cnid_db *cdb, const struct stat *st, } #ifdef DEBUG - LOG(log_debug, logtype_default, "cnid_add: Returned CNID for did %u, name %s as %u", ntohl(did), name, ntohl(hint)); + LOG(log_debug9, logtype_default, "cnid_add: Returned CNID for did %u, name %s as %u", ntohl(did), name, ntohl(hint)); #endif return hint; diff --git a/libatalk/cnid/cdb/cnid_cdb_resolve.c b/libatalk/cnid/cdb/cnid_cdb_resolve.c index afc4c9ad..6c16ce7e 100644 --- a/libatalk/cnid/cdb/cnid_cdb_resolve.c +++ b/libatalk/cnid/cdb/cnid_cdb_resolve.c @@ -1,5 +1,5 @@ /* - * $Id: cnid_cdb_resolve.c,v 1.4 2009-10-29 13:17:29 didg Exp $ + * $Id: cnid_cdb_resolve.c,v 1.5 2009-10-29 13:38:16 didg Exp $ */ #ifdef HAVE_CONFIG_H @@ -41,7 +41,7 @@ char *cnid_cdb_resolve(struct _cnid_db *cdb, cnid_t *id, void *buffer, size_t le memcpy(id, (char *)data.data +CNID_DID_OFS, sizeof(cnid_t)); #ifdef DEBUG - LOG(log_debug, logtype_default, "cnid_resolve: Returning id = %u, did/name = %s", + LOG(log_debug9, logtype_default, "cnid_resolve: Returning id = %u, did/name = %s", ntohl(*id), (char *)data.data + CNID_NAME_OFS); #endif return (char *)data.data + CNID_NAME_OFS; diff --git a/libatalk/cnid/db3/cnid_db3_add.c b/libatalk/cnid/db3/cnid_db3_add.c index f067df42..1cbdf2dc 100644 --- a/libatalk/cnid/db3/cnid_db3_add.c +++ b/libatalk/cnid/db3/cnid_db3_add.c @@ -1,5 +1,5 @@ /* - * $Id: cnid_db3_add.c,v 1.4 2009-10-29 13:17:29 didg Exp $ + * $Id: cnid_db3_add.c,v 1.5 2009-10-29 13:38:16 didg Exp $ * * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu) * All Rights Reserved. See COPYRIGHT. @@ -154,14 +154,14 @@ retry: hint = htonl(id); /* #ifdef DEBUG */ #if 0 - LOG(log_debug, logtype_default, "cnid_add: Found rootinfo for did %u, name %s as %u", ntohl(did), name, ntohl(hint)); + LOG(log_debug9, logtype_default, "cnid_add: Found rootinfo for did %u, name %s as %u", ntohl(did), name, ntohl(hint)); #endif break; case DB_NOTFOUND: hint = htonl(CNID_START); /* #ifdef DEBUG */ #if 0 - LOG(log_debug, logtype_default, "cnid_add: Using CNID_START for did %u, name %s", ntohl(did), name); + LOG(log_debug9, logtype_default, "cnid_add: Using CNID_START for did %u, name %s", ntohl(did), name); #endif break; default: @@ -220,7 +220,7 @@ cnid_t cnid_db3_add(struct _cnid_db *cdb, const struct stat *st, /* ... Return id if it is valid, or if Rootinfo is read-only. */ if (id || (db->flags & CNIDFLAG_DB_RO)) { #ifdef DEBUG - LOG(log_debug, logtype_default, "cnid_add: Looked up did %u, name %s as %u", ntohl(did), name, ntohl(id)); + LOG(log_debug9, logtype_default, "cnid_add: Looked up did %u, name %s as %u", ntohl(did), name, ntohl(id)); #endif return id; } @@ -256,7 +256,7 @@ cnid_t cnid_db3_add(struct _cnid_db *cdb, const struct stat *st, return CNID_INVALID; case 0: #ifdef DEBUG - LOG(log_debug, logtype_default, "cnid_add: Used hint for did %u, name %s as %u", ntohl(did), name, ntohl(hint)); + LOG(log_debug9, logtype_default, "cnid_add: Used hint for did %u, name %s as %u", ntohl(did), name, ntohl(hint)); #endif return hint; } @@ -276,7 +276,7 @@ cnid_t cnid_db3_add(struct _cnid_db *cdb, const struct stat *st, } #ifdef DEBUG - LOG(log_debug, logtype_default, "cnid_add: Returned CNID for did %u, name %s as %u", ntohl(did), name, ntohl(hint)); + LOG(log_debug9, logtype_default, "cnid_add: Returned CNID for did %u, name %s as %u", ntohl(did), name, ntohl(hint)); #endif return hint; diff --git a/libatalk/cnid/db3/cnid_db3_close.c b/libatalk/cnid/db3/cnid_db3_close.c index ec718a48..3eabb319 100644 --- a/libatalk/cnid/db3/cnid_db3_close.c +++ b/libatalk/cnid/db3/cnid_db3_close.c @@ -1,5 +1,5 @@ /* - * $Id: cnid_db3_close.c,v 1.3 2009-10-29 13:17:29 didg Exp $ + * $Id: cnid_db3_close.c,v 1.4 2009-10-29 13:38:16 didg Exp $ */ #ifdef HAVE_CONFIG_H @@ -86,7 +86,7 @@ void cnid_db3_close(struct _cnid_db *cdb) { for (first = list; *list != NULL; ++list) { if ((rc = remove(*list)) != 0) { #ifdef DEBUG - LOG(log_debug, logtype_default, "cnid_close: failed to remove %s: %s", *list, strerror(rc)); + LOG(log_debug9, logtype_default, "cnid_close: failed to remove %s: %s", *list, strerror(rc)); #endif } } diff --git a/libatalk/cnid/db3/cnid_db3_delete.c b/libatalk/cnid/db3/cnid_db3_delete.c index bfef8be0..04182475 100644 --- a/libatalk/cnid/db3/cnid_db3_delete.c +++ b/libatalk/cnid/db3/cnid_db3_delete.c @@ -1,5 +1,5 @@ /* - * $Id: cnid_db3_delete.c,v 1.3 2009-10-29 13:17:29 didg Exp $ + * $Id: cnid_db3_delete.c,v 1.4 2009-10-29 13:38:16 didg Exp $ * * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu) * All Rights Reserved. See COPYRIGHT. @@ -55,7 +55,7 @@ int cnid_db3_delete(struct _cnid_db *cdb, const cnid_t id) { break; case DB_NOTFOUND: #ifdef DEBUG - LOG(log_debug, logtype_default, "cnid_delete: CNID %u not in database", + LOG(log_debug9, logtype_default, "cnid_delete: CNID %u not in database", ntohl(id)); #endif return 0; @@ -141,7 +141,7 @@ retry: } #ifdef DEBUG - LOG(log_debug, logtype_default, "cnid_delete: Deleting CNID %u", ntohl(id)); + LOG(log_debug9, logtype_default, "cnid_delete: Deleting CNID %u", ntohl(id)); #endif if ((rc = db3_txn_commit(tid, 0)) != 0) { LOG(log_error, logtype_default, "cnid_delete: Failed to commit transaction: %s", diff --git a/libatalk/cnid/db3/cnid_db3_get.c b/libatalk/cnid/db3/cnid_db3_get.c index 2269d67d..a885667c 100644 --- a/libatalk/cnid/db3/cnid_db3_get.c +++ b/libatalk/cnid/db3/cnid_db3_get.c @@ -1,5 +1,5 @@ /* - * $Id: cnid_db3_get.c,v 1.4 2009-10-29 13:17:29 didg Exp $ + * $Id: cnid_db3_get.c,v 1.5 2009-10-29 13:38:16 didg Exp $ */ #ifdef HAVE_CONFIG_H @@ -66,7 +66,7 @@ cnid_t cnid_db3_get(struct _cnid_db *cdb, const cnid_t did, char *name, const si memcpy(&id, data.data, sizeof(id)); #ifdef DEBUG - LOG(log_debug, logtype_default, "cnid_get: Returning CNID for %u, name %s as %u", + LOG(log_debug9, logtype_default, "cnid_get: Returning CNID for %u, name %s as %u", ntohl(did), name, ntohl(id)); #endif return id; diff --git a/libatalk/cnid/db3/cnid_db3_lookup.c b/libatalk/cnid/db3/cnid_db3_lookup.c index 8ba9ec74..43e22c19 100644 --- a/libatalk/cnid/db3/cnid_db3_lookup.c +++ b/libatalk/cnid/db3/cnid_db3_lookup.c @@ -1,6 +1,6 @@ /* - * $Id: cnid_db3_lookup.c,v 1.4 2009-10-29 13:17:29 didg Exp $ + * $Id: cnid_db3_lookup.c,v 1.5 2009-10-29 13:38:16 didg Exp $ */ #ifdef HAVE_CONFIG_H @@ -50,7 +50,7 @@ cnid_t cnid_db3_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t * a read-write database. */ if ((db->flags & CNIDFLAG_DB_RO) == 0) { #ifdef DEBUG - LOG(log_debug, logtype_default, "cnid_lookup: Running database checkpoint"); + LOG(log_debug9, logtype_default, "cnid_lookup: Running database checkpoint"); #endif #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) if ((rc = db->dbenv->txn_checkpoint(db->dbenv, LOGFILEMAX, CHECKTIMEMAX, 0))) { @@ -130,7 +130,7 @@ cnid_t cnid_db3_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t /* Either entries are in both databases or neither of them. */ if ((devino && didname) || !(devino || didname)) { #ifdef DEBUG - LOG(log_debug, logtype_default, "cnid_lookup: Looked up did %u, name %s, as %u", ntohl(did), name, ntohl(id)); + LOG(log_debug9, logtype_default, "cnid_lookup: Looked up did %u, name %s, as %u", ntohl(did), name, ntohl(id)); #endif return id; } @@ -138,7 +138,7 @@ cnid_t cnid_db3_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t /* Fix up the database. */ cnid_db3_update(cdb, id, st, did, name, len); #ifdef DEBUG - LOG(log_debug, logtype_default, "cnid_lookup: Looked up did %u, name %s, as %u (needed update)", ntohl(did), name, + LOG(log_debug9, logtype_default, "cnid_lookup: Looked up did %u, name %s, as %u (needed update)", ntohl(did), name, ntohl(id)); #endif return id; diff --git a/libatalk/cnid/db3/cnid_db3_resolve.c b/libatalk/cnid/db3/cnid_db3_resolve.c index 3f352232..c456abd2 100644 --- a/libatalk/cnid/db3/cnid_db3_resolve.c +++ b/libatalk/cnid/db3/cnid_db3_resolve.c @@ -1,5 +1,5 @@ /* - * $Id: cnid_db3_resolve.c,v 1.4 2009-10-29 13:17:29 didg Exp $ + * $Id: cnid_db3_resolve.c,v 1.5 2009-10-29 13:38:16 didg Exp $ */ #ifdef HAVE_CONFIG_H @@ -61,7 +61,7 @@ char *cnid_db3_resolve(struct _cnid_db *cdb, cnid_t *id, void *buffer, size_t le memcpy(id, (char *)data.data + CNID_DEVINO_LEN, sizeof(cnid_t)); #ifdef DEBUG - LOG(log_debug, logtype_default, "cnid_resolve: Returning id = %u, did/name = %s", + LOG(log_debug9, logtype_default, "cnid_resolve: Returning id = %u, did/name = %s", ntohl(*id), (char *)data.data + CNID_HEADER_LEN); #endif return (char *)data.data + CNID_HEADER_LEN; diff --git a/libatalk/unicode/charcnv.c b/libatalk/unicode/charcnv.c index 9e7fcfea..9ff217c5 100644 --- a/libatalk/unicode/charcnv.c +++ b/libatalk/unicode/charcnv.c @@ -235,8 +235,8 @@ charset_t add_charset(char* name) max_charset_t++; #ifdef DEBUG - LOG(log_debug, logtype_default, "Added charset %s with handle %u", name, cur_charset_t); -#endif /* DEBUG */ + LOG(log_debug9, logtype_default, "Added charset %s with handle %u", name, cur_charset_t); +#endif return (cur_charset_t); } -- 2.39.2