Coverity pointed out some inconsistencies on tests for whether columnp and
keyp were nonnull. These tests were, at best, confusing, but in fact every
caller always passed nonnull for both parameters, so this commit drops all
of those tests.
Coverity #10715, 10710.
/* Breaks 'arg' apart into a number of fields in the following order:
*
/* Breaks 'arg' apart into a number of fields in the following order:
*
- * - If 'columnp' is nonnull, the name of a column in 'table'. The column
- * is stored into '*columnp'. The column name may be abbreviated.
+ * - The name of a column in 'table', stored into '*columnp'. The column
+ * name may be abbreviated.
- * - If 'keyp' is nonnull, optionally a key string. (If both 'columnp'
- * and 'keyp' are nonnull, then the column and key names are expected to
- * be separated by ':'). The key is stored as a malloc()'d string into
- * '*keyp', or NULL if no key is present in 'arg'.
+ * - Optionally ':' followed by a key string. The key is stored as a
+ * malloc()'d string into '*keyp', or NULL if no key is present in
+ * 'arg'.
*
* - If 'valuep' is nonnull, an operator followed by a value string. The
* allowed operators are the 'n_allowed' string in 'allowed_operators',
*
* - If 'valuep' is nonnull, an operator followed by a value string. The
* allowed operators are the 'n_allowed' string in 'allowed_operators',
* stored as a malloc()'d string into '*valuep', or NULL if no value is
* present in 'arg'.
*
* stored as a malloc()'d string into '*valuep', or NULL if no value is
* present in 'arg'.
*
- * At least 'columnp' or 'keyp' must be nonnull.
- *
* On success, returns NULL. On failure, returned a malloc()'d string error
* message and stores NULL into all of the nonnull output arguments. */
static char * WARN_UNUSED_RESULT
* On success, returns NULL. On failure, returned a malloc()'d string error
* message and stores NULL into all of the nonnull output arguments. */
static char * WARN_UNUSED_RESULT
char **valuep)
{
const char *p = arg;
char **valuep)
{
const char *p = arg;
- assert(columnp || keyp);
assert(!(operatorp && !valuep));
assert(!(operatorp && !valuep));
- if (keyp) {
- *keyp = NULL;
- }
if (valuep) {
*valuep = NULL;
}
/* Parse column name. */
if (valuep) {
*valuep = NULL;
}
/* Parse column name. */
- if (columnp) {
- char *column_name;
-
- error = ovsdb_token_parse(&p, &column_name);
- if (error) {
- goto error;
- }
- if (column_name[0] == '\0') {
- free(column_name);
- error = xasprintf("%s: missing column name", arg);
- goto error;
- }
- error = get_column(table, column_name, columnp);
+ error = ovsdb_token_parse(&p, &column_name);
+ if (error) {
+ goto error;
+ }
+ if (column_name[0] == '\0') {
- if (error) {
- goto error;
- }
+ error = xasprintf("%s: missing column name", arg);
+ goto error;
+ }
+ error = get_column(table, column_name, columnp);
+ free(column_name);
+ if (error) {
+ goto error;
}
/* Parse key string. */
}
/* Parse key string. */
- if (*p == ':' || !columnp) {
- if (columnp) {
- p++;
- } else if (!keyp) {
- error = xasprintf("%s: key not accepted here", arg);
- goto error;
- }
+ if (*p == ':') {
+ p++;
error = ovsdb_token_parse(&p, keyp);
if (error) {
goto error;
}
error = ovsdb_token_parse(&p, keyp);
if (error) {
goto error;
}
- } else if (keyp) {
- *keyp = NULL;
}
/* Parse value string. */
}
/* Parse value string. */
- if (columnp) {
- *columnp = NULL;
- }
- if (keyp) {
- free(*keyp);
- *keyp = NULL;
- }
+ *columnp = NULL;
+ free(*keyp);
+ *keyp = NULL;
if (valuep) {
free(*valuep);
*valuep = NULL;
if (valuep) {
free(*valuep);
*valuep = NULL;