sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

s4-param Remove offset != -1 checks

Browse Source 
No offset values are set to -1 in the parameter table

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2011-07-07 21:38:46 +10:00
parent 61b937d236
commit f50f9374b5
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source4/param/loadparm.c
View File

@ -2106,7 +2106,7 @@ static void copy_service(struct loadparm_service *pserviceDest,
bool not_added; bool not_added;
for (i = 0; parm_table[i].label; i++) 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))) { (bcopyall || bitmap_query(pcopymapDest, i))) {
void *src_ptr = void *src_ptr =
((char *)pserviceSource) + parm_table[i].offset; ((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++) for (i = 0; parm_table[i].label; i++)
if (parm_table[i].p_class == P_GLOBAL && if (parm_table[i].p_class == P_GLOBAL &&
parm_table[i].offset != -1 &&
(i == 0 || (parm_table[i].offset != parm_table[i - 1].offset))) { (i == 0 || (parm_table[i].offset != parm_table[i - 1].offset))) {
if (!show_defaults && (lp_ctx->flags[i] & FLAG_DEFAULT)) if (!show_defaults && (lp_ctx->flags[i] & FLAG_DEFAULT))
continue; 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++) { for (i = 0; parm_table[i].label; i++) {
if (parm_table[i].p_class == P_LOCAL && if (parm_table[i].p_class == P_LOCAL &&
parm_table[i].offset != -1 &&
(*parm_table[i].label != '-') && (*parm_table[i].label != '-') &&
(i == 0 || (parm_table[i].offset != parm_table[i - 1].offset))) (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) { if (snum == -1) {
/* do the globals */ /* do the globals */
for (; parm_table[*i].label; (*i)++) { for (; parm_table[*i].label; (*i)++) {
if (parm_table[*i].offset == -1 if ((*parm_table[*i].label == '-'))
|| (*parm_table[*i].label == '-'))
continue; continue;
if ((*i) > 0 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)++) { for (; parm_table[*i].label; (*i)++) {
if (parm_table[*i].p_class == P_LOCAL && if (parm_table[*i].p_class == P_LOCAL &&
parm_table[*i].offset != -1 &&
(*parm_table[*i].label != '-') && (*parm_table[*i].label != '-') &&
((*i) == 0 || ((*i) == 0 ||
(parm_table[*i].offset != (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++) { for (i = 0; parm_table[i].label; i++) {
if ((parm_table[i].type == P_STRING || if ((parm_table[i].type == P_STRING ||
parm_table[i].type == P_USTRING) && parm_table[i].type == P_USTRING) &&
parm_table[i].offset != -1 &&
!(lp_ctx->flags[i] & FLAG_CMDLINE)) { !(lp_ctx->flags[i] & FLAG_CMDLINE)) {
char **r; char **r;
if (parm_table[i].p_class == P_LOCAL) { if (parm_table[i].p_class == P_LOCAL) {