diff options
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/config.c | 22 | ||||
| -rw-r--r-- | src/config/config_check.c | 26 | ||||
| -rw-r--r-- | src/config/config_collapse.c | 2 |
3 files changed, 25 insertions, 25 deletions
diff --git a/src/config/config.c b/src/config/config.c index fbb5a528ec7..92f917915e1 100644 --- a/src/config/config.c +++ b/src/config/config.c @@ -580,30 +580,30 @@ __wt_config_next(WT_CONFIG *conf, WT_CONFIG_ITEM *key, WT_CONFIG_ITEM *value) */ static int __config_getraw( - WT_CONFIG *cparser, WT_CONFIG_ITEM *key, WT_CONFIG_ITEM *value, int top) + WT_CONFIG *cparser, WT_CONFIG_ITEM *key, WT_CONFIG_ITEM *value, bool top) { WT_CONFIG sparser; WT_CONFIG_ITEM k, v, subk; WT_DECL_RET; - int found; + bool found; - found = 0; + found = false; while ((ret = __config_next(cparser, &k, &v)) == 0) { if (k.type != WT_CONFIG_ITEM_STRING && k.type != WT_CONFIG_ITEM_ID) continue; if (k.len == key->len && strncmp(key->str, k.str, k.len) == 0) { *value = v; - found = 1; + found = true; } else if (k.len < key->len && key->str[k.len] == '.' && strncmp(key->str, k.str, k.len) == 0) { subk.str = key->str + k.len + 1; subk.len = (key->len - k.len) - 1; WT_RET(__wt_config_initn( cparser->session, &sparser, v.str, v.len)); - if ((ret = - __config_getraw(&sparser, &subk, value, 0)) == 0) - found = 1; + if ((ret = __config_getraw( + &sparser, &subk, value, false)) == 0) + found = true; WT_RET_NOTFOUND_OK(ret); } } @@ -629,7 +629,7 @@ __wt_config_get(WT_SESSION_IMPL *session, for (found = 0; *cfg != NULL; cfg++) { WT_RET(__wt_config_init(session, &cparser, *cfg)); - if ((ret = __config_getraw(&cparser, key, value, 1)) == 0) + if ((ret = __config_getraw(&cparser, key, value, true)) == 0) found = 1; else if (ret != WT_NOTFOUND) return (ret); @@ -679,7 +679,7 @@ __wt_config_getone(WT_SESSION_IMPL *session, WT_CONFIG cparser; WT_RET(__wt_config_init(session, &cparser, config)); - return (__config_getraw(&cparser, key, value, 1)); + return (__config_getraw(&cparser, key, value, true)); } /* @@ -695,7 +695,7 @@ __wt_config_getones(WT_SESSION_IMPL *session, { key, strlen(key), 0, WT_CONFIG_ITEM_STRING }; WT_RET(__wt_config_init(session, &cparser, config)); - return (__config_getraw(&cparser, &key_item, value, 1)); + return (__config_getraw(&cparser, &key_item, value, true)); } /* @@ -755,7 +755,7 @@ __wt_config_subgetraw(WT_SESSION_IMPL *session, WT_CONFIG cparser; WT_RET(__wt_config_initn(session, &cparser, cfg->str, cfg->len)); - return (__config_getraw(&cparser, key, value, 1)); + return (__config_getraw(&cparser, key, value, true)); } /* diff --git a/src/config/config_check.c b/src/config/config_check.c index 391209104c7..20ecc9f5db3 100644 --- a/src/config/config_check.c +++ b/src/config/config_check.c @@ -245,7 +245,8 @@ config_check(WT_SESSION_IMPL *session, WT_CONFIG parser, cparser, sparser; WT_CONFIG_ITEM k, v, ck, cv, dummy; WT_DECL_RET; - int badtype, found, i; + int i; + bool badtype, found; /* * The config_len parameter is optional, and allows passing in strings @@ -272,27 +273,26 @@ config_check(WT_SESSION_IMPL *session, (int)k.len, k.str); if (strcmp(checks[i].type, "boolean") == 0) { - badtype = (v.type != WT_CONFIG_ITEM_BOOL && + badtype = v.type != WT_CONFIG_ITEM_BOOL && (v.type != WT_CONFIG_ITEM_NUM || - (v.val != 0 && v.val != 1))); + (v.val != 0 && v.val != 1)); } else if (strcmp(checks[i].type, "category") == 0) { /* Deal with categories of the form: XXX=(XXX=blah). */ ret = config_check(session, checks[i].subconfigs, k.str + strlen(checks[i].name) + 1, v.len); if (ret != EINVAL) - badtype = 0; + badtype = false; else - badtype = 1; + badtype = true; } else if (strcmp(checks[i].type, "format") == 0) { - badtype = 0; + badtype = false; } else if (strcmp(checks[i].type, "int") == 0) { - badtype = (v.type != WT_CONFIG_ITEM_NUM); + badtype = v.type != WT_CONFIG_ITEM_NUM; } else if (strcmp(checks[i].type, "list") == 0) { - badtype = (v.len > 0 && - v.type != WT_CONFIG_ITEM_STRUCT); + badtype = v.len > 0 && v.type != WT_CONFIG_ITEM_STRUCT; } else if (strcmp(checks[i].type, "string") == 0) { - badtype = 0; + badtype = false; } else WT_RET_MSG(session, EINVAL, "unknown configuration type: '%s'", @@ -338,18 +338,18 @@ config_check(WT_SESSION_IMPL *session, */ WT_RET(__wt_config_subinit(session, &sparser, &v)); - found = 1; + found = true; while (found && (ret = __wt_config_next(&sparser, &v, &dummy)) == 0) { ret = __wt_config_subgetraw( session, &cv, &v, &dummy); - found = (ret == 0); + found = ret == 0; } } else { ret = __wt_config_subgetraw(session, &cv, &v, &dummy); - found = (ret == 0); + found = ret == 0; } if (ret != 0 && ret != WT_NOTFOUND) diff --git a/src/config/config_collapse.c b/src/config/config_collapse.c index 23cb03c9b3a..448bf69152b 100644 --- a/src/config/config_collapse.c +++ b/src/config/config_collapse.c @@ -90,7 +90,7 @@ err: __wt_scr_free(session, &tmp); * the qsort stable. */ typedef struct { - char *k, *v; /* key, value */ + char *k, *v; /* key, value */ size_t gen; /* generation */ } WT_CONFIG_MERGE_ENTRY; |