summaryrefslogtreecommitdiff
path: root/source4/lib/ldb
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-08-23 09:19:19 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:16:35 -0500
commit0749ab04002f2288cddd994b830163c107230f31 (patch)
tree84414cbf781adb1668a678bdb5551e37a0a82607 /source4/lib/ldb
parent4cd7e5a2459df4150523f980a85a98601631c3f8 (diff)
downloadsamba-0749ab04002f2288cddd994b830163c107230f31.tar.gz
samba-0749ab04002f2288cddd994b830163c107230f31.tar.bz2
samba-0749ab04002f2288cddd994b830163c107230f31.zip
r17743: fix compiler warnings
metze (This used to be commit 694a56b0ae0125594d6a23d8465249f011b6284e)
Diffstat (limited to 'source4/lib/ldb')
-rw-r--r--source4/lib/ldb/include/ldb.h18
-rw-r--r--source4/lib/ldb/include/ldb_private.h2
2 files changed, 10 insertions, 10 deletions
diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h
index 2e659b5307..b07cdd964c 100644
--- a/source4/lib/ldb/include/ldb.h
+++ b/source4/lib/ldb/include/ldb.h
@@ -80,6 +80,12 @@ struct ldb_val {
};
#endif
+/*! \cond DOXYGEN_IGNORE */
+#ifndef PRINTF_ATTRIBUTE
+#define PRINTF_ATTRIBUTE(a,b)
+#endif
+/*! \endcond */
+
/**
internal ldb exploded dn structures
*/
@@ -204,7 +210,7 @@ enum ldb_debug_level {LDB_DEBUG_FATAL, LDB_DEBUG_ERROR,
*/
struct ldb_debug_ops {
void (*debug)(void *context, enum ldb_debug_level level,
- const char *fmt, va_list ap);
+ const char *fmt, va_list ap) PRINTF_ATTRIBUTE(3,0);
void *context;
};
@@ -242,12 +248,6 @@ struct ldb_utf8_fns {
*/
#define LDB_FLG_RECONNECT 4
-/*! \cond DOXYGEN_IGNORE */
-#ifndef PRINTF_ATTRIBUTE
-#define PRINTF_ATTRIBUTE(a,b)
-#endif
-/*! \endcond */
-
/*
structures for ldb_parse_tree handling code
*/
@@ -1000,7 +1000,7 @@ int ldb_valid_attr_name(const char *s);
\sa ldb_ldif_read for the reader equivalent to this function.
*/
int ldb_ldif_write(struct ldb_context *ldb,
- int (*fprintf_fn)(void *, const char *, ...),
+ int (*fprintf_fn)(void *, const char *, ...) PRINTF_ATTRIBUTE(2,3),
void *private_data,
const struct ldb_ldif *ldif);
@@ -1329,7 +1329,7 @@ struct ldb_val ldb_val_dup(void *mem_ctx, const struct ldb_val *v);
*/
int ldb_set_debug(struct ldb_context *ldb,
void (*debug)(void *context, enum ldb_debug_level level,
- const char *fmt, va_list ap),
+ const char *fmt, va_list ap) PRINTF_ATTRIBUTE(3,0),
void *context);
/**
diff --git a/source4/lib/ldb/include/ldb_private.h b/source4/lib/ldb/include/ldb_private.h
index 754e4bc859..d66b6f1cc7 100644
--- a/source4/lib/ldb/include/ldb_private.h
+++ b/source4/lib/ldb/include/ldb_private.h
@@ -148,7 +148,7 @@ int ldb_next_del_trans(struct ldb_module *module);
int ldb_next_init(struct ldb_module *module);
void ldb_set_errstring(struct ldb_context *ldb, const char *err_string);
-void ldb_asprintf_errstring(struct ldb_context *ldb, const char *format, ...);
+void ldb_asprintf_errstring(struct ldb_context *ldb, const char *format, ...) PRINTF_ATTRIBUTE(2,3);
void ldb_reset_err_string(struct ldb_context *ldb);
int ldb_register_module(const struct ldb_module_ops *);