sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-30 19:42:05 +03:00
Code Activity

s3:utils: add debug functions instead of magic format strings in net_idmap_check.c

Browse Source 
This way the compiler can check the format string and doesn't generate warnings.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Stefan Metzmacher
2014-02-26 20:16:26 +01:00
committed by Jeremy Allison
parent c55a4e0b81
commit 002a1c57a9
1 changed files with 39 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
source3/utils/net_idmap_check.c
View File

@ -73,7 +73,9 @@ static bool is_map(const struct record* r) {
/* action *********************************************************************/
typedef struct check_action {
const char* fmt;
void (*fmt)(struct check_action *a,
struct record *r,
TDB_DATA *v);
const char* name;
const char* prompt;
const char* answers;
@ -97,6 +99,38 @@ struct check_actions {
check_action invalid_diff;
};
static void invalid_mapping_fmt(struct check_action *a,
struct record *r,
TDB_DATA *v)
{
d_printf("%1$s: %2$s -> %3$s\n(%4$s <- %3$s)\n",
a->name,
print_data(r, r->key),
print_data(r, r->val),
(v ? print_data(r, *v) : ""));
}
static void record_exists_fmt(struct check_action *a,
struct record *r,
TDB_DATA *v)
{
d_printf("%1$s: %2$s\n-%4$s\n+%3$s\n",
a->name,
print_data(r, r->key),
print_data(r, r->val),
(v ? print_data(r, *v) : ""));
}
static void valid_mapping_fmt(struct check_action *a,
struct record *r,
TDB_DATA *v)
{
d_printf("%1$s: %2$s <-> %3$s\n",
a->name,
print_data(r, r->key),
print_data(r, r->val));
}
static struct check_actions
check_actions_init(const struct check_options* opts) {
struct check_actions ret = {
@ -117,7 +151,7 @@ check_actions_init(const struct check_options* opts) {
.verbose = true,
},
.invalid_mapping = (check_action) {
.fmt = "%1$s: %2$s -> %3$s\n(%4$s <- %3$s)\n",
.fmt = invalid_mapping_fmt,
.name = "Invalid mapping",
.prompt = "[e]dit/[d]elete/[D]elete all"
"/[s]kip/[S]kip all",
@ -134,7 +168,7 @@ check_actions_init(const struct check_options* opts) {
.verbose = true,
},
.record_exists = (check_action) {
.fmt = "%1$s: %2$s\n-%4$s\n+%3$s\n",
.fmt = record_exists_fmt,
.name = "Record exists",
.prompt = "[o]verwrite/[O]verwrite all/[e]dit"
"/[d]elete/[D]elete all/[s]kip/[S]kip all",
@ -164,7 +198,7 @@ check_actions_init(const struct check_options* opts) {
.verbose = true,
},
.valid_mapping = (check_action) {
.fmt = "%1$s: %2$s <-> %3$s\n",
.fmt = valid_mapping_fmt,
.name = "Mapping",
.auto_action = 's',
.verbose = opts->verbose,
@ -230,10 +264,7 @@ static char get_action(struct check_action* a, struct record* r, TDB_DATA* v) {
d_printf("\n");
}
} else {
d_printf(a->fmt, a->name,
print_data(r, r->key),
print_data(r, r->val),
(v ? print_data(r, *v) : ""));
a->fmt(a, r, v);
}
}