r26511: Janitorial: Fix a warning for the 'printf' attribute on gendb_search_v

While at it, also add a PRINTF_ATTRIBUTE for talloc_vasprintf.
(This used to be commit 5b3a8c8ae195e6a98357a407a0699493f54a8b79)

2 files changed, 8 insertions, 5 deletions

diff --git a/source4/lib/talloc/talloc.c b/source4/lib/talloc/talloc.c
index 4d72c0e871..6661c10bb5 100644
--- a/source4/lib/talloc/talloc.c
+++ b/source4/lib/talloc/talloc.c
@@ -1245,13 +1245,15 @@ char *talloc_strndup_append_buffer(char *s, const char *a, size_t n)
 #endif
 #endif
 
+char *talloc_vasprintf(const void *t, const char *fmt, va_list ap) PRINTF_ATTRIBUTE(2,0);
+
 char *talloc_vasprintf(const void *t, const char *fmt, va_list ap)
-{	
+{
 	int len;
 	char *ret;
 	va_list ap2;
 	char c;
-	
+
 	/* this call looks strange, but it makes it work on older solaris boxes */
 	va_copy(ap2, ap);
 	len = vsnprintf(&c, 1, fmt, ap2);
@@ -1276,6 +1278,7 @@ char *talloc_vasprintf(const void *t, const char *fmt, va_list ap)
   Perform string formatting, and return a pointer to newly allocated
   memory holding the result, inside a memory pool.
  */
+char *talloc_asprintf(const void *t, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3);
 char *talloc_asprintf(const void *t, const char *fmt, ...)
 {
 	va_list ap;
diff --git a/source4/lib/util/util_ldb.c b/source4/lib/util/util_ldb.c
index ba8443c236..a8719af190 100644
--- a/source4/lib/util/util_ldb.c
+++ b/source4/lib/util/util_ldb.c
@@ -23,16 +23,16 @@
 #include "includes.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
-
+#include "lib/util/util_ldb.h"
 /*
   search the sam for the specified attributes - va_list variant
 */
-int gendb_search_v(struct ldb_context *ldb, 
+int gendb_search_v(struct ldb_context *ldb,
 		   TALLOC_CTX *mem_ctx,
 		   struct ldb_dn *basedn,
 		   struct ldb_message ***msgs,
 		   const char * const *attrs,
-		   const char *format, 
+		   const char *format,
 		   va_list ap)  _PRINTF_ATTRIBUTE(6,0)
 {
 	enum ldb_scope scope = LDB_SCOPE_SUBTREE;