[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Fri Mar 15 13:23:02 MDT 2013
The branch, master has been updated
via fd8b258 examples/libsmbclient: Cast mode_t to unsigned int for GNU/Solaris build
via 88e6342 s3-lsad: Cast getpid() result to unsigned int for GNU/Solaris build
via 6a5cae9 s3-epmd: Cast getpid() result to unsigned int for GNU/Solaris build
via 1ccfaa4 vfs_smb_traffic_analyzer: Cast mode_t to unsigned int for GNU/Solaris build
via 174a99f dbwrap: Cast getpid() result to unsigned int for GNU/Solaris build
via cdc0622 spoolssd: Cast getpid() result to unsigned int for GNU/Solaris build
via 1fba140 s3-smbd/process.c: Cast pid_t result to int for GNU/Solaris build
via bf7da08 s3-lib/server_prefork: Cast pid_t result to unsigned int for GNU/Solaris build
via 21f18d0 s4-ntvfs: Cast getpid() result to unsigned int for GNU/Solaris build
via 7ea026e lib/util: Cast mode_t result to unsigned int for GNU/Solaris build
via 3464074 ntdb: Cast getpid() result to unsigned int for GNU/Solaris build
via 29dfc94 ccan: Cast getpid() result to unsigned int for GNU/Solaris build
from fa6992e torture: Update ndr README.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit fd8b258fa20496c3e6360248503f59704d206742
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Mar 15 10:14:35 2013 +1100
examples/libsmbclient: Cast mode_t to unsigned int for GNU/Solaris build
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Fri Mar 15 20:22:08 CET 2013 on sn-devel-104
commit 88e6342936cd82324e6bfed665e81831260a654d
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Mar 15 10:06:10 2013 +1100
s3-lsad: Cast getpid() result to unsigned int for GNU/Solaris build
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 6a5cae96788640ddce89a047bbc63b4dbc94ca89
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Mar 15 10:02:53 2013 +1100
s3-epmd: Cast getpid() result to unsigned int for GNU/Solaris build
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 1ccfaa413a887dd573dc03c78fcc621e629d9582
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Mar 15 09:59:31 2013 +1100
vfs_smb_traffic_analyzer: Cast mode_t to unsigned int for GNU/Solaris build
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 174a99f4864745cd995e5983cb95b8c7091d0725
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Mar 15 09:52:13 2013 +1100
dbwrap: Cast getpid() result to unsigned int for GNU/Solaris build
Reviewed-by: Jeremy Allison <jra at samba.org>
commit cdc062273ce580877fd47e3f328d24c624dfbc0f
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Mar 14 21:17:54 2013 +1100
spoolssd: Cast getpid() result to unsigned int for GNU/Solaris build
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 1fba1406449880384bb585a0eda6e9be60a868fe
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Mar 14 21:15:18 2013 +1100
s3-smbd/process.c: Cast pid_t result to int for GNU/Solaris build
Reviewed-by: Jeremy Allison <jra at samba.org>
commit bf7da085b125ca9b18bdca22e05a9a6613771e3d
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Mar 14 20:36:34 2013 +1100
s3-lib/server_prefork: Cast pid_t result to unsigned int for GNU/Solaris build
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 21f18d0205bc7aca4166e8436083c16540f95781
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Mar 14 20:18:46 2013 +1100
s4-ntvfs: Cast getpid() result to unsigned int for GNU/Solaris build
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 7ea026e332192ebba4c634c93fed6e02bfb7f89e
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Mar 14 20:14:19 2013 +1100
lib/util: Cast mode_t result to unsigned int for GNU/Solaris build
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 346407443e6210da9c7335df7b898d96ff74c0e3
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Mar 14 19:55:29 2013 +1100
ntdb: Cast getpid() result to unsigned int for GNU/Solaris build
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 29dfc94ca312523c5682235f642fb49030abd995
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Mar 14 19:26:44 2013 +1100
ccan: Cast getpid() result to unsigned int for GNU/Solaris build
Reviewed-by: Jeremy Allison <jra at samba.org>
-----------------------------------------------------------------------
Summary of changes:
examples/libsmbclient/testchmod.c | 4 ++--
lib/ccan/failtest/failtest.c | 8 ++++----
lib/ntdb/lock.c | 6 ++++--
lib/ntdb/tools/ntdbtorture.c | 12 ++++++------
lib/util/util.c | 2 +-
source3/lib/server_prefork.c | 2 +-
source3/modules/vfs_smb_traffic_analyzer.c | 4 ++--
source3/printing/spoolssd.c | 2 +-
source3/rpc_server/epmd.c | 2 +-
source3/rpc_server/lsasd.c | 2 +-
source3/smbd/process.c | 2 +-
source3/utils/dbwrap_torture.c | 4 ++--
source4/ntvfs/nbench/vfs_nbench.c | 2 +-
13 files changed, 27 insertions(+), 25 deletions(-)
Changeset truncated at 500 lines:
diff --git a/examples/libsmbclient/testchmod.c b/examples/libsmbclient/testchmod.c
index 4473146..b285a81 100644
--- a/examples/libsmbclient/testchmod.c
+++ b/examples/libsmbclient/testchmod.c
@@ -42,7 +42,7 @@ int main(int argc, char * argv[])
return 1;
}
- printf("\nBefore chmod: mode = %04o\n", st.st_mode);
+ printf("\nBefore chmod: mode = %04o\n", (unsigned int)st.st_mode);
if (smbc_chmod(pSmbPath, mode) < 0)
{
@@ -56,7 +56,7 @@ int main(int argc, char * argv[])
return 1;
}
- printf("After chmod: mode = %04o\n", st.st_mode);
+ printf("After chmod: mode = %04o\n", (unsigned int)st.st_mode);
return 0;
}
diff --git a/lib/ccan/failtest/failtest.c b/lib/ccan/failtest/failtest.c
index 7915a92..cffe36c 100644
--- a/lib/ccan/failtest/failtest.c
+++ b/lib/ccan/failtest/failtest.c
@@ -321,7 +321,7 @@ static void PRINTF_FMT(1, 2) trace(const char *fmt, ...)
fprintf(tracef, " ");
p = failpath_string();
- fprintf(tracef, "%i: %u: %s ", idx++, getpid(), p);
+ fprintf(tracef, "%i: %u: %s ", idx++, (unsigned int)getpid(), p);
va_start(ap, fmt);
vfprintf(tracef, fmt, ap);
va_end(ap);
@@ -686,8 +686,8 @@ static bool should_fail(struct failtest_call *call)
/* Don't timeout. */
signal(SIGUSR1, SIG_IGN);
- sprintf(str, "xterm -e gdb /proc/%d/exe %d &",
- getpid(), getpid());
+ sprintf(str, "xterm -e gdb /proc/%u/exe %u &",
+ (unsigned int)getpid(), (unsigned int)getpid());
if (system(str) == 0)
sleep(5);
} else {
@@ -774,7 +774,7 @@ static bool should_fail(struct failtest_call *call)
else
p = c->file;
trace("%u->%u (%u.%02u): %s (%s:%u)\n",
- getppid(), getpid(),
+ (unsigned int)getppid(), (unsigned int)getpid(),
(int)diff.tv_sec, (int)diff.tv_usec / 10000,
failpath, p, c->line);
free(failpath);
diff --git a/lib/ntdb/lock.c b/lib/ntdb/lock.c
index 4517e25..71d6d85 100644
--- a/lib/ntdb/lock.c
+++ b/lib/ntdb/lock.c
@@ -52,8 +52,10 @@ bool check_lock_pid(struct ntdb_context *ntdb, const char *call, bool log)
if (log) {
ntdb_logerr(ntdb, NTDB_ERR_LOCK, NTDB_LOG_USE_ERROR,
- "%s: fork() detected after lock acquisition!"
- " (%u vs %u)", call, ntdb->file->locker, getpid());
+ "%s: fork() detected after lock acquisition!"
+ " (%u vs %u)", call,
+ (unsigned int)ntdb->file->locker,
+ (unsigned int)getpid());
}
return false;
}
diff --git a/lib/ntdb/tools/ntdbtorture.c b/lib/ntdb/tools/ntdbtorture.c
index 717f5dd..3bcf320 100644
--- a/lib/ntdb/tools/ntdbtorture.c
+++ b/lib/ntdb/tools/ntdbtorture.c
@@ -61,7 +61,7 @@ static void ntdb_log(struct ntdb_context *ntdb,
{
char str[200];
signal(SIGUSR1, SIG_IGN);
- sprintf(str,"xterm -e gdb /proc/%d/exe %d", getpid(), getpid());
+ sprintf(str,"xterm -e gdb /proc/%u/exe %u", (unsigned int)getpid(), (unsigned int)getpid());
system(str);
}
#endif
@@ -74,7 +74,7 @@ static void segv_handler(int sig, siginfo_t *info, void *p)
char string[100];
sprintf(string, "%u: death at %p (map_ptr %p, map_size %zu)\n",
- getpid(), info->si_addr, db->file->map_ptr,
+ (unsigned int)getpid(), info->si_addr, db->file->map_ptr,
(size_t)db->file->map_size);
if (write(2, string, strlen(string)) > 0)
sleep(60);
@@ -85,7 +85,7 @@ static void warn_on_err(enum NTDB_ERROR e, struct ntdb_context *ntdb,
const char *why)
{
if (e != NTDB_SUCCESS) {
- fprintf(stderr, "%u:%s:%s\n", getpid(), why,
+ fprintf(stderr, "%u:%s:%s\n", (unsigned int)getpid(), why,
ntdb ? ntdb_errorstr(e) : "(no ntdb)");
error_count++;
}
@@ -271,14 +271,14 @@ static int run_child(const char *filename, int i, int seed, unsigned num_loops,
db = ntdb_open(filename, ntdb_flags, O_RDWR | O_CREAT, 0600,
&log_attr);
if (!db) {
- fprintf(stderr, "%u:%s:%s\n", getpid(), filename,
+ fprintf(stderr, "%u:%s:%s\n", (unsigned int)getpid(), filename,
"db open failed");
exit(1);
}
#if 0
if (i == 0) {
- printf("pid %i\n", getpid());
+ printf("pid %u\n", (unsigned int)getpid());
sleep(9);
} else
sleep(10);
@@ -527,7 +527,7 @@ done:
db = ntdb_open(test_ntdb, NTDB_DEFAULT, O_RDWR | O_CREAT,
0600, &log_attr);
if (!db) {
- fprintf(stderr, "%u:%s:%s\n", getpid(), test_ntdb,
+ fprintf(stderr, "%u:%s:%s\n", (unsigned int)getpid(), test_ntdb,
"db open failed");
exit(1);
}
diff --git a/lib/util/util.c b/lib/util/util.c
index 464fc62..7962c1e 100644
--- a/lib/util/util.c
+++ b/lib/util/util.c
@@ -235,7 +235,7 @@ _PUBLIC_ bool directory_create_or_exist_strict(const char *dname,
if ((st.st_mode & 0777) != dir_perms) {
DEBUG(0, ("invalid permissions on directory "
"'%s': has 0%o should be 0%o\n", dname,
- (st.st_mode & 0777), dir_perms));
+ (unsigned int)(st.st_mode & 0777), (unsigned int)dir_perms));
return false;
}
diff --git a/source3/lib/server_prefork.c b/source3/lib/server_prefork.c
index 49d1778..c725607 100644
--- a/source3/lib/server_prefork.c
+++ b/source3/lib/server_prefork.c
@@ -277,7 +277,7 @@ int prefork_retire_children(struct messaging_context *msg_ctx,
(pfp->pool[i].num_clients < 1)) &&
(pfp->pool[i].started <= age_limit)) {
/* tell the child it's time to give up */
- DEBUG(5, ("Retiring pid %d!\n", pfp->pool[i].pid));
+ DEBUG(5, ("Retiring pid %u!\n", (unsigned int)pfp->pool[i].pid));
pfp->pool[i].cmds = PF_SRV_MSG_EXIT;
messaging_send(msg_ctx,
pid_to_procid(pfp->pool[i].pid),
diff --git a/source3/modules/vfs_smb_traffic_analyzer.c b/source3/modules/vfs_smb_traffic_analyzer.c
index 9151bfb..92a1762 100644
--- a/source3/modules/vfs_smb_traffic_analyzer.c
+++ b/source3/modules/vfs_smb_traffic_analyzer.c
@@ -518,7 +518,7 @@ static void smb_traffic_analyzer_send_data(vfs_handle_struct *handle,
tm, seconds, handle, username, vfs_id_open,
3, ((struct open_data *) data)->filename,
talloc_asprintf( talloc_tos(), "%u",
- ((struct open_data *) data)->mode),
+ (unsigned int)((struct open_data *) data)->mode),
talloc_asprintf( talloc_tos(), "%u",
((struct open_data *) data)->result));
break;
@@ -534,7 +534,7 @@ static void smb_traffic_analyzer_send_data(vfs_handle_struct *handle,
tm, seconds, handle, username, vfs_id_mkdir, \
3, ((struct mkdir_data *) data)->path, \
talloc_asprintf( talloc_tos(), "%u", \
- ((struct mkdir_data *) data)->mode), \
+ (unsigned int)((struct mkdir_data *) data)->mode), \
talloc_asprintf( talloc_tos(), "%u", \
((struct mkdir_data *) data)->result ));
break;
diff --git a/source3/printing/spoolssd.c b/source3/printing/spoolssd.c
index 464d12b..8f182f8 100644
--- a/source3/printing/spoolssd.c
+++ b/source3/printing/spoolssd.c
@@ -807,7 +807,7 @@ pid_t start_spoolssd(struct tevent_context *ev_ctx,
exit(1);
}
- DEBUG(1, ("SPOOLSS Daemon Started (%d)\n", getpid()));
+ DEBUG(1, ("SPOOLSS Daemon Started (%u)\n", (unsigned int)getpid()));
pfh_manage_pool(ev_ctx, msg_ctx, &pf_spoolss_cfg, spoolss_pool);
diff --git a/source3/rpc_server/epmd.c b/source3/rpc_server/epmd.c
index 8d77c4a..6b6119b 100644
--- a/source3/rpc_server/epmd.c
+++ b/source3/rpc_server/epmd.c
@@ -222,7 +222,7 @@ void start_epmd(struct tevent_context *ev_ctx,
exit(1);
}
- DEBUG(1, ("Endpoint Mapper Daemon Started (%d)\n", getpid()));
+ DEBUG(1, ("Endpoint Mapper Daemon Started (%u)\n", (unsigned int)getpid()));
/* loop forever */
rc = tevent_loop_wait(ev_ctx);
diff --git a/source3/rpc_server/lsasd.c b/source3/rpc_server/lsasd.c
index 9815ad9..8d2245a 100644
--- a/source3/rpc_server/lsasd.c
+++ b/source3/rpc_server/lsasd.c
@@ -973,7 +973,7 @@ void start_lsasd(struct tevent_context *ev_ctx,
exit(1);
}
- DEBUG(1, ("LSASD Daemon Started (%d)\n", getpid()));
+ DEBUG(1, ("LSASD Daemon Started (%u)\n", (unsigned int)getpid()));
/* loop forever */
rc = tevent_loop_wait(ev_ctx);
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 0a8e62c..1640cca 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -3081,7 +3081,7 @@ bool fork_echo_handler(struct smbd_server_connection *sconn)
listener_pipe[1] = -1;
sconn->smb1.echo_handler.trusted_fd = listener_pipe[0];
- DEBUG(10,("fork_echo_handler: main[%d] echo_child[%d]\n", (int)getpid(), child));
+ DEBUG(10,("fork_echo_handler: main[%d] echo_child[%d]\n", (int)getpid(), (int)child));
/*
* Without smb signing this is the same as the normal smbd
diff --git a/source3/utils/dbwrap_torture.c b/source3/utils/dbwrap_torture.c
index 9ece297..2741820 100644
--- a/source3/utils/dbwrap_torture.c
+++ b/source3/utils/dbwrap_torture.c
@@ -57,7 +57,7 @@ static void print_counters(void)
int i;
uint32_t *old_counters;
- printf("[%4u] Counters: ", getpid());
+ printf("[%4u] Counters: ", (unsigned int)getpid());
old_counters = (uint32_t *)old_data.dptr;
for (i=0; i < old_data.dsize/sizeof(uint32_t); i++) {
printf("%6u ", old_counters[i]);
@@ -89,7 +89,7 @@ static bool check_counters(struct db_context *db, TDB_DATA data)
for (i=0; i < old_data.dsize/sizeof(uint32_t); i++) {
if (counters[i] < old_counters[i]) {
printf("[%4u] ERROR: counters has decreased for node %u From %u to %u\n",
- getpid(), i, old_counters[i], counters[i]);
+ (unsigned int)getpid(), i, old_counters[i], counters[i]);
success = false;
return false;
}
diff --git a/source4/ntvfs/nbench/vfs_nbench.c b/source4/ntvfs/nbench/vfs_nbench.c
index 74a9e43..42a3f36 100644
--- a/source4/ntvfs/nbench/vfs_nbench.c
+++ b/source4/ntvfs/nbench/vfs_nbench.c
@@ -126,7 +126,7 @@ static NTSTATUS nbench_connect(struct ntvfs_module_context *ntvfs,
}
logname = talloc_asprintf(req, "/tmp/nbenchlog%d.%u", ntvfs->depth,
- getpid());
+ (unsigned int)getpid());
NT_STATUS_HAVE_NO_MEMORY(logname);
nprivates->log_fd = open(logname, O_WRONLY|O_CREAT|O_APPEND, 0644);
talloc_free(logname);
--
Samba Shared Repository
More information about the samba-cvs
mailing list