X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftdb.c;h=fa8e88769bc5505a6836e546b0143aa1292b4f82;hp=38124582d125625766922e4dab802ca22de2ce82;hb=f6d1f564b9dd7c1871128e70477e19e4044ff50f;hpb=74c15d72a2ddc484c771bc226134673409e9a40f diff --git a/ccan/tdb2/tdb.c b/ccan/tdb2/tdb.c index 38124582..fa8e8876 100644 --- a/ccan/tdb2/tdb.c +++ b/ccan/tdb2/tdb.c @@ -706,10 +706,10 @@ const char *tdb_errorstr(const struct tdb_context *tdb) return "Invalid error code"; } -void COLD tdb_logerr(struct tdb_context *tdb, - enum TDB_ERROR ecode, - enum tdb_log_level level, - const char *fmt, ...) +enum TDB_ERROR COLD tdb_logerr(struct tdb_context *tdb, + enum TDB_ERROR ecode, + enum tdb_log_level level, + const char *fmt, ...) { char *message; va_list ap; @@ -720,7 +720,7 @@ void COLD tdb_logerr(struct tdb_context *tdb, tdb->ecode = ecode; if (!tdb->logfn) - return; + return ecode; /* FIXME: Doesn't assume asprintf. */ va_start(ap, fmt); @@ -732,7 +732,7 @@ void COLD tdb_logerr(struct tdb_context *tdb, tdb->logfn(tdb, TDB_LOG_ERROR, tdb->log_private, "out of memory formatting message:"); tdb->logfn(tdb, level, tdb->log_private, fmt); - return; + return ecode; } va_start(ap, fmt); len = vsprintf(message, fmt, ap); @@ -740,4 +740,5 @@ void COLD tdb_logerr(struct tdb_context *tdb, tdb->logfn(tdb, level, tdb->log_private, message); free(message); errno = saved_errno; + return ecode; }