diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-09-07 15:35:18 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:05:28 -0500 |
| commit | 959915a8cbea0c598ef1f29ce666329a521ef2f6 (patch) | |
| tree | 68e1b2b483f60be3839dc476ab0ca0fb4dd0ec0b /source4/lib | |
| parent | cd962355abad90a2161765a7be7d26e63572cab7 (diff) | |
| download | samba-959915a8cbea0c598ef1f29ce666329a521ef2f6.tar.gz samba-959915a8cbea0c598ef1f29ce666329a521ef2f6.tar.bz2 samba-959915a8cbea0c598ef1f29ce666329a521ef2f6.zip | |
r25001: Fix more C++ and other warnings, fix some of the indentation with ts=4 lines that I accidently added earlier.
(This used to be commit 0bcb21ed740fcec0f48ad36bbc2deee2948e8fc7)
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/registry/patchfile_dotreg.c | 2 | ||||
| -rw-r--r-- | source4/lib/socket/connect_multi.c | 3 | ||||
| -rw-r--r-- | source4/lib/tdb/tools/tdbtorture.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/source4/lib/registry/patchfile_dotreg.c b/source4/lib/registry/patchfile_dotreg.c index 32b70d2144..85cf8ab251 100644 --- a/source4/lib/registry/patchfile_dotreg.c +++ b/source4/lib/registry/patchfile_dotreg.c @@ -79,7 +79,7 @@ static WERROR reg_dotreg_diff_del_value(void *_data, const char *path, const cha static WERROR reg_dotreg_diff_done(void *_data) { - struct dotreg_data *data = _data; + struct dotreg_data *data = (struct dotreg_data *)_data; close(data->fd); talloc_free(data); diff --git a/source4/lib/socket/connect_multi.c b/source4/lib/socket/connect_multi.c index 76e5034a58..6bf7ca4d3e 100644 --- a/source4/lib/socket/connect_multi.c +++ b/source4/lib/socket/connect_multi.c @@ -62,7 +62,8 @@ static void continue_one(struct composite_context *creq); /* setup an async socket_connect, with multiple ports */ -_PUBLIC_ struct composite_context *socket_connect_multi_send(TALLOC_CTX *mem_ctx, +_PUBLIC_ struct composite_context *socket_connect_multi_send( + TALLOC_CTX *mem_ctx, const char *server_address, int num_server_ports, uint16_t *server_ports, diff --git a/source4/lib/tdb/tools/tdbtorture.c b/source4/lib/tdb/tools/tdbtorture.c index 14a2b48cdc..ca71c736ad 100644 --- a/source4/lib/tdb/tools/tdbtorture.c +++ b/source4/lib/tdb/tools/tdbtorture.c @@ -238,7 +238,7 @@ static void usage(void) unlink("torture.tdb"); - pids = calloc(sizeof(pid_t), num_procs); + pids = (pid_t *)calloc(sizeof(pid_t), num_procs); pids[0] = getpid(); for (i=0;i<num_procs-1;i++) { |