From b041a589ae680de38f4e9c8c4979c3972a4e7b07 Mon Sep 17 00:00:00 2001 From: Christof Schmitt Date: Wed, 21 Oct 2015 11:07:57 -0700 Subject: [PATCH] Remove function name from callers of DBG_* It is now added automatically. Signed-off-by: Christof Schmitt Reviewed-by: Jeremy Allison --- lib/util/charset/util_str.c | 4 ++-- source3/lib/ctdbd_conn.c | 2 +- source3/lib/dbwrap/dbwrap_ctdb.c | 2 +- source3/lib/dbwrap/dbwrap_watch.c | 11 +++++------ source3/lib/messages_dgm_ref.c | 11 +++++------ source3/lib/util.c | 4 ++-- 6 files changed, 16 insertions(+), 18 deletions(-) diff --git a/lib/util/charset/util_str.c b/lib/util/charset/util_str.c index c1b81f119e7..ef8a82af767 100644 --- a/lib/util/charset/util_str.c +++ b/lib/util/charset/util_str.c @@ -545,13 +545,13 @@ char *strstr_m(const char *src, const char *findstr) frame = talloc_stackframe(); if (!push_ucs2_talloc(frame, &src_w, src, &converted_size)) { - DBG_WARNING("strstr_m: src malloc fail\n"); + DBG_WARNING("src malloc fail\n"); TALLOC_FREE(frame); return NULL; } if (!push_ucs2_talloc(frame, &find_w, findstr, &converted_size)) { - DBG_WARNING("strstr_m: find malloc fail\n"); + DBG_WARNING("find malloc fail\n"); TALLOC_FREE(frame); return NULL; } diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index c7c63560848..9187ee77dd0 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -431,7 +431,7 @@ static int ctdbd_init_connection(TALLOC_CTX *mem_ctx, conn->sockname = talloc_strdup(conn, sockname); if (conn->sockname == NULL) { - DBG_ERR("%s: talloc failed\n", __func__); + DBG_ERR("talloc failed\n"); ret = ENOMEM; goto fail; } diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c index 9066beb791c..457f427e84a 100644 --- a/source3/lib/dbwrap/dbwrap_ctdb.c +++ b/source3/lib/dbwrap/dbwrap_ctdb.c @@ -1664,7 +1664,7 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx, fd = tdb_fd(db_ctdb->wtdb->tdb); ret = fchmod(fd, mode); if (ret == -1) { - DBG_WARNING("%s: fchmod failed: %s\n", __func__, + DBG_WARNING("fchmod failed: %s\n", strerror(errno)); TALLOC_FREE(result); return NULL; diff --git a/source3/lib/dbwrap/dbwrap_watch.c b/source3/lib/dbwrap/dbwrap_watch.c index 426fe77e438..09e67fb35b6 100644 --- a/source3/lib/dbwrap/dbwrap_watch.c +++ b/source3/lib/dbwrap/dbwrap_watch.c @@ -295,8 +295,7 @@ static void dbwrap_watch_record_stored_fn(TDB_DATA key, TDB_DATA data, size_t i, num_ids; if ((data.dsize % sizeof(struct server_id)) != 0) { - DBG_WARNING("%s: Invalid data size: %zu\n", __func__, - data.dsize); + DBG_WARNING("Invalid data size: %zu\n", data.dsize); return; } num_ids = data.dsize / sizeof(struct server_id); @@ -312,8 +311,8 @@ static void dbwrap_watch_record_stored_fn(TDB_DATA key, TDB_DATA data, key.dptr, key.dsize); if (!NT_STATUS_IS_OK(status)) { struct server_id_buf tmp; - DBG_WARNING("%s: messaging_send to %s failed: %s\n", - __func__, server_id_str_buf(dst, &tmp), + DBG_WARNING("messaging_send to %s failed: %s\n", + server_id_str_buf(dst, &tmp), nt_errstr(status)); } } @@ -346,8 +345,8 @@ static void dbwrap_watch_record_stored(struct db_context *db, return; } if (!NT_STATUS_IS_OK(status)) { - DBG_WARNING("%s: dbwrap_parse_record failed: %s\n", - __func__, nt_errstr(status)); + DBG_WARNING("dbwrap_parse_record failed: %s\n", + nt_errstr(status)); } } diff --git a/source3/lib/messages_dgm_ref.c b/source3/lib/messages_dgm_ref.c index e3b2d8819e4..3ea8b9d33aa 100644 --- a/source3/lib/messages_dgm_ref.c +++ b/source3/lib/messages_dgm_ref.c @@ -73,8 +73,7 @@ void *messaging_dgm_ref(TALLOC_CTX *mem_ctx, struct tevent_context *ev, ret = messaging_dgm_init(ev, unique, socket_dir, lockfile_dir, msg_dgm_ref_recv, NULL); - DBG_DEBUG("%s: messaging_dgm_init returned %s\n", __func__, - strerror(ret)); + DBG_DEBUG("messaging_dgm_init returned %s\n", strerror(ret)); if (ret != 0) { DEBUG(10, ("messaging_dgm_init failed: %s\n", strerror(ret))); @@ -86,8 +85,8 @@ void *messaging_dgm_ref(TALLOC_CTX *mem_ctx, struct tevent_context *ev, } else { int ret; ret = messaging_dgm_get_unique(getpid(), unique); - DBG_DEBUG("%s: messaging_dgm_get_unique returned %s\n", - __func__, strerror(ret)); + DBG_DEBUG("messaging_dgm_get_unique returned %s\n", + strerror(ret)); if (ret != 0) { TALLOC_FREE(result); *err = ret; @@ -103,7 +102,7 @@ void *messaging_dgm_ref(TALLOC_CTX *mem_ctx, struct tevent_context *ev, } } - DBG_DEBUG("%s: unique = %"PRIu64"\n", __func__, *unique); + DBG_DEBUG("unique = %"PRIu64"\n", *unique); refs = tmp_refs; @@ -140,7 +139,7 @@ static int msg_dgm_ref_destructor(struct msg_dgm_ref *r) TALLOC_FREE(r->tevent_handle); - DBG_DEBUG("%s: refs=%p\n", __func__, refs); + DBG_DEBUG("refs=%p\n", refs); if (refs == NULL) { messaging_dgm_destroy(); diff --git a/source3/lib/util.c b/source3/lib/util.c index 7c24f8aa936..3a8bc678a87 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -1967,8 +1967,8 @@ struct server_id pid_to_procid(pid_t pid) ret = messaging_dgm_get_unique(pid, &unique); if (ret != 0) { - DBG_WARNING("%s: messaging_dgm_get_unique failed: %s\n", - __func__, strerror(ret)); + DBG_WARNING("messaging_dgm_get_unique failed: %s\n", + strerror(ret)); } return (struct server_id) { -- 2.11.4.GIT