From 906a512e0b6b6b4d3398db274c7e34ce788357df Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 6 May 2001 01:28:17 +0000 Subject: merge from 2.2 (This used to be commit 13bf966cb8ed8df6b02018dceff94c275def8200) --- source3/tdb/tdbutil.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'source3/tdb/tdbutil.c') diff --git a/source3/tdb/tdbutil.c b/source3/tdb/tdbutil.c index c387644efc..a620f085a9 100644 --- a/source3/tdb/tdbutil.c +++ b/source3/tdb/tdbutil.c @@ -127,7 +127,7 @@ size_t tdb_pack(char *buf, int bufsize, char *fmt, ...) uint32 d; int i; void *p; - int len=0; + int len; char *s; char c; char *buf0 = buf; @@ -188,6 +188,7 @@ size_t tdb_pack(char *buf, int bufsize, char *fmt, ...) default: DEBUG(0,("Unknown tdb_pack format %c in %s\n", c, fmt)); + len = 0; break; } @@ -213,7 +214,7 @@ int tdb_unpack(char *buf, int bufsize, char *fmt, ...) va_list ap; uint16 *w; uint32 *d; - int len=0; + int len; int *i; void **p; char *s, **b; @@ -272,6 +273,8 @@ int tdb_unpack(char *buf, int bufsize, char *fmt, ...) default: DEBUG(0,("Unknown tdb_unpack format %c in %s\n", c, fmt)); + + len = 0; break; } -- cgit