diff options
| author | Volker Lendecke <vl@samba.org> | 2007-12-20 22:17:16 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2007-12-21 09:58:20 +0100 |
| commit | addf598cde41d17ad4cf497a64b9a2b27e4028c5 (patch) | |
| tree | 11b020444f0728e1745e2e2af29b81b55d8fc467 /source3/lib | |
| parent | eeb92cedde4bc45603be4fdcf2f53dd2cc29f1d0 (diff) | |
| download | samba-addf598cde41d17ad4cf497a64b9a2b27e4028c5.tar.gz samba-addf598cde41d17ad4cf497a64b9a2b27e4028c5.tar.bz2 samba-addf598cde41d17ad4cf497a64b9a2b27e4028c5.zip | |
Some C++ warnings
(This used to be commit 5ab82d4f574f2a2e2761e9e414c66a70aeffb05d)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/memcache.c | 2 | ||||
| -rw-r--r-- | source3/lib/socket_wrapper/socket_wrapper.c | 4 | ||||
| -rw-r--r-- | source3/lib/time.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source3/lib/memcache.c b/source3/lib/memcache.c index 192a822cde..448b8b2f84 100644 --- a/source3/lib/memcache.c +++ b/source3/lib/memcache.c @@ -61,7 +61,7 @@ static int memcache_destructor(struct memcache *cache) { for (e = cache->mru; e != NULL; e = next) { next = e->next; - if (memcache_is_talloc(e->n) + if (memcache_is_talloc((enum memcache_number)e->n) && (e->valuelength == sizeof(void *))) { DATA_BLOB key, value; void *ptr; diff --git a/source3/lib/socket_wrapper/socket_wrapper.c b/source3/lib/socket_wrapper/socket_wrapper.c index 3a72c5a74a..a84c460114 100644 --- a/source3/lib/socket_wrapper/socket_wrapper.c +++ b/source3/lib/socket_wrapper/socket_wrapper.c @@ -571,8 +571,8 @@ static const char *socket_wrapper_pcap_file(void) { static int initialized = 0; static const char *s = NULL; - static const struct swrap_file_hdr h; - static const struct swrap_packet p; + static const struct swrap_file_hdr h = { 0, }; + static const struct swrap_packet p = { 0, }; if (initialized == 1) { return s; diff --git a/source3/lib/time.c b/source3/lib/time.c index 5301e3a55a..f98e03197f 100644 --- a/source3/lib/time.c +++ b/source3/lib/time.c @@ -1382,7 +1382,7 @@ void unix_to_nt_time_abs(NTTIME *nt, time_t t) d = (double)(t); d *= 1.0e7; - *nt = d; + *nt = (NTTIME)d; /* convert to a negative value */ *nt=~*nt; @@ -1443,7 +1443,7 @@ const char *display_time(NTTIME nttime) low = ~(nttime & 0xFFFFFFFF); low = low/(1000*1000*10); - sec=high+low; + sec=(int)(high+low); days=sec/(60*60*24); hours=(sec - (days*60*60*24)) / (60*60); |