diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-07-07 21:38:46 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-07-08 11:23:23 +0200 |
| commit | f50f9374b584b881aac0304aeefc56ebfd6b745a (patch) | |
| tree | 5771d14fb122655d40f80ea35933e913932c6cbb | |
| parent | 61b937d23695ef8820a969f769732ecf79662597 (diff) | |
| download | samba-f50f9374b584b881aac0304aeefc56ebfd6b745a.tar.gz samba-f50f9374b584b881aac0304aeefc56ebfd6b745a.tar.bz2 samba-f50f9374b584b881aac0304aeefc56ebfd6b745a.zip | |
s4-param Remove offset != -1 checks
No offset values are set to -1 in the parameter table
Andrew Bartlett
| -rw-r--r-- | source4/param/loadparm.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 47ee05bcd2..b9363435c9 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -2106,7 +2106,7 @@ static void copy_service(struct loadparm_service *pserviceDest, bool not_added; for (i = 0; parm_table[i].label; i++) - if (parm_table[i].offset != -1 && parm_table[i].p_class == P_LOCAL && + if (parm_table[i].p_class == P_LOCAL && (bcopyall || bitmap_query(pcopymapDest, i))) { void *src_ptr = ((char *)pserviceSource) + parm_table[i].offset; @@ -2983,7 +2983,6 @@ static void dump_globals(struct loadparm_context *lp_ctx, FILE *f, for (i = 0; parm_table[i].label; i++) if (parm_table[i].p_class == P_GLOBAL && - parm_table[i].offset != -1 && (i == 0 || (parm_table[i].offset != parm_table[i - 1].offset))) { if (!show_defaults && (lp_ctx->flags[i] & FLAG_DEFAULT)) continue; @@ -3018,7 +3017,6 @@ static void dump_a_service(struct loadparm_service * pService, struct loadparm_s for (i = 0; parm_table[i].label; i++) { if (parm_table[i].p_class == P_LOCAL && - parm_table[i].offset != -1 && (*parm_table[i].label != '-') && (i == 0 || (parm_table[i].offset != parm_table[i - 1].offset))) { @@ -3085,8 +3083,7 @@ struct parm_struct *lpcfg_next_parameter(struct loadparm_context *lp_ctx, int sn if (snum == -1) { /* do the globals */ for (; parm_table[*i].label; (*i)++) { - if (parm_table[*i].offset == -1 - || (*parm_table[*i].label == '-')) + if ((*parm_table[*i].label == '-')) continue; if ((*i) > 0 @@ -3103,7 +3100,6 @@ struct parm_struct *lpcfg_next_parameter(struct loadparm_context *lp_ctx, int sn for (; parm_table[*i].label; (*i)++) { if (parm_table[*i].p_class == P_LOCAL && - parm_table[*i].offset != -1 && (*parm_table[*i].label != '-') && ((*i) == 0 || (parm_table[*i].offset != @@ -3220,7 +3216,6 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx) for (i = 0; parm_table[i].label; i++) { if ((parm_table[i].type == P_STRING || parm_table[i].type == P_USTRING) && - parm_table[i].offset != -1 && !(lp_ctx->flags[i] & FLAG_CMDLINE)) { char **r; if (parm_table[i].p_class == P_LOCAL) { |