Also, rename private logfn to log_fn for consistency with other members.
/* Logging function */
void (*log_fn)(struct tdb_context *tdb,
enum tdb_log_level level,
/* Logging function */
void (*log_fn)(struct tdb_context *tdb,
enum tdb_log_level level,
- void *data,
- const char *message);
+ const char *message,
+ void *data);
void *log_data;
/* Hash function. */
void *log_data;
/* Hash function. */
va_end(ap);
if (len < 0) {
va_end(ap);
if (len < 0) {
- tdb->log_fn(tdb, TDB_LOG_ERROR, tdb->log_data,
- "out of memory formatting message:");
- tdb->log_fn(tdb, level, tdb->log_data, fmt);
+ tdb->log_fn(tdb, TDB_LOG_ERROR,
+ "out of memory formatting message:", tdb->log_data);
+ tdb->log_fn(tdb, level, fmt, tdb->log_data);
- tdb->log_fn(tdb, level, tdb->log_data, message);
+ tdb->log_fn(tdb, level, message, tdb->log_data);
free(message);
}
errno = saved_errno;
free(message);
}
errno = saved_errno;
struct tdb_attribute_base base; /* .attr = TDB_ATTRIBUTE_LOG */
void (*fn)(struct tdb_context *tdb,
enum tdb_log_level level,
struct tdb_attribute_base base; /* .attr = TDB_ATTRIBUTE_LOG */
void (*fn)(struct tdb_context *tdb,
enum tdb_log_level level,
- void *data,
- const char *message);
+ const char *message,
+ void *data);
};
void tap_log_fn(struct tdb_context *tdb,
};
void tap_log_fn(struct tdb_context *tdb,
- enum tdb_log_level level, void *priv,
- const char *message)
+ enum tdb_log_level level,
+ const char *message, void *priv)
{
if (suppress_logging)
return;
{
if (suppress_logging)
return;
extern union tdb_attribute tap_log_attr;
void tap_log_fn(struct tdb_context *tdb,
extern union tdb_attribute tap_log_attr;
void tap_log_fn(struct tdb_context *tdb,
- enum tdb_log_level level, void *priv,
- const char *message);
+ enum tdb_log_level level,
+ const char *message, void *priv);
#endif /* TDB2_TEST_LOGGING_H */
#endif /* TDB2_TEST_LOGGING_H */
/* Normally we get a log when setting random seed. */
static void my_log_fn(struct tdb_context *tdb,
/* Normally we get a log when setting random seed. */
static void my_log_fn(struct tdb_context *tdb,
- enum tdb_log_level level, void *priv,
- const char *message)
+ enum tdb_log_level level,
+ const char *message, void *priv)
}
static void tdb_log(struct tdb_context *tdb, enum tdb_log_level level,
}
static void tdb_log(struct tdb_context *tdb, enum tdb_log_level level,
- void *data, const char *message)
+ const char *message, void *data)
{
fputs(message, stderr);
}
{
fputs(message, stderr);
}
}
static void tdb_log(struct tdb_context *tdb, enum tdb_log_level level,
}
static void tdb_log(struct tdb_context *tdb, enum tdb_log_level level,
- void *priv, const char *message)
+ const char *message, void *priv)
{
fputs(message, stderr);
}
{
fputs(message, stderr);
}
static union tdb_attribute seed_attr;
static void tdb_log(struct tdb_context *tdb, enum tdb_log_level level,
static union tdb_attribute seed_attr;
static void tdb_log(struct tdb_context *tdb, enum tdb_log_level level,
- void *data, const char *message)
+ const char *message, void *data)
{
fputs(message, stdout);
fflush(stdout);
{
fputs(message, stdout);
fflush(stdout);