The branch, master has been updated
via e7351603890 ctdb_mutex_ceph_rados_helper: revert strtoull_err()
usage
via 278eb236ae9 ctdb-daemon: Fix maybe-uninitialized error with picky
developer
from 42e96696a09 wafbuild: create missing private library symlinks on
platforms without soname support for shared libs
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e7351603890c62829f3e33a9dd471ea373a6c470
Author: David Disseldorp <[email protected]>
Date: Fri Mar 1 16:40:50 2019 +0100
ctdb_mutex_ceph_rados_helper: revert strtoull_err() usage
Compilation currently fails, as ctdb_mutex_ceph_rados_helper doesn't
include or link against the samba-util library. Revert back to the
previous strtoull() behaviour, which works fine.
Signed-off-by: David Disseldorp <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
Autobuild-User(master): Jeremy Allison <[email protected]>
Autobuild-Date(master): Fri Mar 1 18:34:18 UTC 2019 on sn-devel-144
commit 278eb236ae9f8640c3281a836869c9eacbc2b1b3
Author: Amitay Isaacs <[email protected]>
Date: Fri Mar 1 14:18:31 2019 +1100
ctdb-daemon: Fix maybe-uninitialized error with picky developer
263/386] Compiling ctdb/server/ctdb_recovery_helper.c
In file included from ../../server/ctdb_recovery_helper.c:24:0:
../../server/ctdb_recovery_helper.c: In function ‘main’:
../../../lib/talloc/talloc.h:911:34: error: ‘mem_ctx’ may be used
uninitialized in this function [-Werror=maybe-uninitialized]
#define TALLOC_FREE(ctx) do { if (ctx != NULL) { talloc_free(ctx);
ctx=NULL; } } while(0)
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
ctdb/server/ctdb_recovery_helper.c | 2 +-
ctdb/utils/ceph/ctdb_mutex_ceph_rados_helper.c | 8 ++------
2 files changed, 3 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/server/ctdb_recovery_helper.c
b/ctdb/server/ctdb_recovery_helper.c
index 57e12b47037..eed71da5df8 100644
--- a/ctdb/server/ctdb_recovery_helper.c
+++ b/ctdb/server/ctdb_recovery_helper.c
@@ -2737,7 +2737,7 @@ int main(int argc, char *argv[])
{
int write_fd;
const char *sockpath;
- TALLOC_CTX *mem_ctx;
+ TALLOC_CTX *mem_ctx = NULL;
struct tevent_context *ev;
struct ctdb_client_context *client;
int ret = 0;
diff --git a/ctdb/utils/ceph/ctdb_mutex_ceph_rados_helper.c
b/ctdb/utils/ceph/ctdb_mutex_ceph_rados_helper.c
index a43855008c0..7ef76c26e02 100644
--- a/ctdb/utils/ceph/ctdb_mutex_ceph_rados_helper.c
+++ b/ctdb/utils/ceph/ctdb_mutex_ceph_rados_helper.c
@@ -301,14 +301,10 @@ int main(int argc, char *argv[])
cmr_state->pool_name = argv[3];
cmr_state->object = argv[4];
if (argc == 6) {
- int error = 0;
/* optional lock duration provided */
char *endptr = NULL;
- cmr_state->lock_duration_s = strtoull_err(argv[5],
- &endptr,
- 0,
- &error);
- if ((endptr == argv[5]) || (*endptr != '\0') || (error != 0)) {
+ cmr_state->lock_duration_s = strtoull(argv[5], &endptr, 0);
+ if ((endptr == argv[5]) || (*endptr != '\0')) {
fprintf(stdout, CTDB_MUTEX_STATUS_ERROR);
ret = -EINVAL;
goto err_ctx_cleanup;
--
Samba Shared Repository
