From b01f5d40bb4e03ba7d40238fe58317df0e2f76d2 Mon Sep 17 00:00:00 2001 From: didg Date: Thu, 29 Oct 2009 13:17:28 +0000 Subject: [PATCH] use log_debug rather than log_info for LOG inside ifdef DEBUG --- etc/afpd/file.c | 28 ++++++++++++------------ etc/afpd/filedir.c | 6 ++--- libatalk/adouble/ad_open.c | 4 ++-- 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 ++-- 15 files changed, 53 insertions(+), 53 deletions(-) diff --git a/etc/afpd/file.c b/etc/afpd/file.c index da4fddcf..05004642 100644 --- a/etc/afpd/file.c +++ b/etc/afpd/file.c @@ -1,5 +1,5 @@ /* - * $Id: file.c,v 1.117 2009-10-29 12:58:11 didg Exp $ + * $Id: file.c,v 1.118 2009-10-29 13:17:28 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_info, logtype_afpd, "begin getmetadata:"); + LOG(log_debug, 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_info, logtype_default, "begin getfilparams:"); + LOG(log_debug, 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_info, logtype_afpd, "end getfilparams:"); + LOG(log_debug, 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_info, logtype_afpd, "begin setfilparams:"); + LOG(log_debug, logtype_afpd, "begin setfilparams:"); #endif /* DEBUG */ upath = path->u_name; @@ -971,7 +971,7 @@ setfilparam_done: } #ifdef DEBUG - LOG(log_info, logtype_afpd, "end setfilparams:"); + LOG(log_debug, 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_info, logtype_afpd, "begin renamefile:"); + LOG(log_debug, 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_info, logtype_afpd, "end renamefile:"); + LOG(log_debug, 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_info, logtype_afpd, "begin copy_all:"); + LOG(log_debug, 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_info, logtype_afpd, "end copy_all:"); + LOG(log_debug, 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_info, logtype_afpd, "begin copyfile:"); + LOG(log_debug, 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_info, logtype_afpd, "end copyfile:"); + LOG(log_debug, 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_info, logtype_afpd, "begin deletefile:"); + LOG(log_debug, 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_info, logtype_afpd, "end deletefile:"); + LOG(log_debug, logtype_afpd, "end deletefile:"); #endif /* DEBUG */ return err; diff --git a/etc/afpd/filedir.c b/etc/afpd/filedir.c index f5ce7fbc..fcc13a41 100644 --- a/etc/afpd/filedir.c +++ b/etc/afpd/filedir.c @@ -1,5 +1,5 @@ /* - * $Id: filedir.c,v 1.62 2009-10-29 12:58:11 didg Exp $ + * $Id: filedir.c,v 1.63 2009-10-29 13:17:28 didg Exp $ * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -66,7 +66,7 @@ more information */ uid_t uid; int ret = AFP_OK; #ifdef DEBUG - LOG(log_info, logtype_afpd, "begin matchfile2dirperms:"); + LOG(log_debug, logtype_afpd, "begin matchfile2dirperms:"); #endif /* DEBUG */ if (stat(upath, &st ) < 0) { @@ -124,7 +124,7 @@ more information */ } /* end else if stat success */ #ifdef DEBUG - LOG(log_info, logtype_afpd, "end matchfile2dirperms:"); + LOG(log_debug, logtype_afpd, "end matchfile2dirperms:"); #endif /* DEBUG */ return ret; } diff --git a/libatalk/adouble/ad_open.c b/libatalk/adouble/ad_open.c index 874b328a..64aef676 100644 --- a/libatalk/adouble/ad_open.c +++ b/libatalk/adouble/ad_open.c @@ -1,5 +1,5 @@ /* - * $Id: ad_open.c,v 1.52 2009-10-23 08:24:33 didg Exp $ + * $Id: ad_open.c,v 1.53 2009-10-29 13:17:29 didg Exp $ * * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu) * Copyright (c) 1990,1991 Regents of The University of Michigan. @@ -1064,7 +1064,7 @@ ad_mkdir( const char *path, int mode) struct stat stbuf; #ifdef DEBUG - LOG(log_info, logtype_default, "ad_mkdir: Creating directory with mode %d", mode); + LOG(log_debug, logtype_default, "ad_mkdir: Creating directory with mode %d", mode); #endif /* DEBUG */ st_invalid = ad_mode_st(path, &mode, &stbuf); diff --git a/libatalk/cnid/cdb/cnid_cdb_add.c b/libatalk/cnid/cdb/cnid_cdb_add.c index ca3447f7..eecce31d 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.5 2009-10-14 01:38:28 didg Exp $ + * $Id: cnid_cdb_add.c,v 1.6 2009-10-29 13:17:29 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_info, logtype_default, "cnid_add: Looked up did %u, name %s as %u", ntohl(did), name, ntohl(id)); + LOG(log_debug, 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_info, logtype_default, "cnid_add: Returned CNID for did %u, name %s as %u", ntohl(did), name, ntohl(hint)); + LOG(log_debug, 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_info, logtype_cnid, "cnid_getstamp: Returning stamp"); + LOG(log_debug, 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 901b623c..ac232e47 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.2 2005-04-28 20:49:59 bfernhomberg Exp $ + * $Id: cnid_cdb_delete.c,v 1.3 2009-10-29 13:17:29 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_info, logtype_default, "cnid_delete: Deleting CNID %u", ntohl(id)); + LOG(log_debug, 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 2f609577..7922a9ea 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.3 2005-05-03 14:55:13 didg Exp $ + * $Id: cnid_cdb_get.c,v 1.4 2009-10-29 13:17:29 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_info, logtype_default, "cnid_get: Returning CNID for %u, name %s as %u", + LOG(log_debug, 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 0eebb9f9..4548a162 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.3 2005-05-03 14:55:13 didg Exp $ + * $Id: cnid_cdb_lookup.c,v 1.4 2009-10-29 13:17:29 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_info, logtype_default, "cnid_lookup: Looked up did %u, name %s, as %u (needed update)", ntohl(did), name, ntohl(id)); + LOG(log_debug, 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 f8ac3405..8dc58240 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.3 2005-05-03 14:55:13 didg Exp $ + * $Id: cnid_cdb_rebuild_add.c,v 1.4 2009-10-29 13:17:29 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_info, logtype_default, "cnid_add: Looked up did %u, name %s as %u", ntohl(did), name, ntohl(id)); + LOG(log_debug, 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_info, logtype_default, "cnid_add: Returned CNID for did %u, name %s as %u", ntohl(did), name, ntohl(hint)); + LOG(log_debug, 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 b865bf62..afc4c9ad 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.3 2005-05-03 14:55:13 didg Exp $ + * $Id: cnid_cdb_resolve.c,v 1.4 2009-10-29 13:17:29 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_info, logtype_default, "cnid_resolve: Returning id = %u, did/name = %s", + LOG(log_debug, 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 f699a74e..f067df42 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.3 2005-05-03 14:55:13 didg Exp $ + * $Id: cnid_db3_add.c,v 1.4 2009-10-29 13:17:29 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_info, logtype_default, "cnid_add: Found rootinfo for did %u, name %s as %u", ntohl(did), name, ntohl(hint)); + LOG(log_debug, 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_info, logtype_default, "cnid_add: Using CNID_START for did %u, name %s", ntohl(did), name); + LOG(log_debug, 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_info, logtype_default, "cnid_add: Looked up did %u, name %s as %u", ntohl(did), name, ntohl(id)); + LOG(log_debug, 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_info, logtype_default, "cnid_add: Used hint for did %u, name %s as %u", ntohl(did), name, ntohl(hint)); + LOG(log_debug, 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_info, logtype_default, "cnid_add: Returned CNID for did %u, name %s as %u", ntohl(did), name, ntohl(hint)); + LOG(log_debug, 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 b309c947..ec718a48 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.2 2005-04-28 20:49:59 bfernhomberg Exp $ + * $Id: cnid_db3_close.c,v 1.3 2009-10-29 13:17:29 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_info, logtype_default, "cnid_close: failed to remove %s: %s", *list, strerror(rc)); + LOG(log_debug, 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 ffebf698..bfef8be0 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.2 2005-04-28 20:49:59 bfernhomberg Exp $ + * $Id: cnid_db3_delete.c,v 1.3 2009-10-29 13:17:29 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_info, logtype_default, "cnid_delete: CNID %u not in database", + LOG(log_debug, logtype_default, "cnid_delete: CNID %u not in database", ntohl(id)); #endif return 0; @@ -141,7 +141,7 @@ retry: } #ifdef DEBUG - LOG(log_info, logtype_default, "cnid_delete: Deleting CNID %u", ntohl(id)); + LOG(log_debug, 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 eabd4ada..2269d67d 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.3 2005-05-03 14:55:13 didg Exp $ + * $Id: cnid_db3_get.c,v 1.4 2009-10-29 13:17:29 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_info, logtype_default, "cnid_get: Returning CNID for %u, name %s as %u", + LOG(log_debug, 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 803a03af..8ba9ec74 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.3 2005-05-03 14:55:13 didg Exp $ + * $Id: cnid_db3_lookup.c,v 1.4 2009-10-29 13:17:29 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_info, logtype_default, "cnid_lookup: Running database checkpoint"); + LOG(log_debug, 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_info, logtype_default, "cnid_lookup: Looked up did %u, name %s, as %u", ntohl(did), name, ntohl(id)); + LOG(log_debug, 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_info, logtype_default, "cnid_lookup: Looked up did %u, name %s, as %u (needed update)", ntohl(did), name, + LOG(log_debug, 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 fdc12ac8..3f352232 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.3 2005-05-03 14:55:13 didg Exp $ + * $Id: cnid_db3_resolve.c,v 1.4 2009-10-29 13:17:29 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_info, logtype_default, "cnid_resolve: Returning id = %u, did/name = %s", + LOG(log_debug, 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; -- 2.39.2