Skip to content

Commit

Permalink
doveadm: Code cleanup - coding style fixes for doveadm_cmd_param*() a…
Browse files Browse the repository at this point in the history 
…ccessors
  • Loading branch information
@cmouse @sirainen
cmouse authored and sirainen committed Feb 26, 2016
1 parent 79ec87e commit db8b229
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 25 deletions.
45 changes: 26 additions & 19 deletions src/doveadm/doveadm-cmd.c
View file
Expand Up @@ -186,7 +186,8 @@ void doveadm_cmds_deinit(void)
}

static const struct doveadm_cmd_param*
doveadm_cmd_param_get(int argc, const struct doveadm_cmd_param* params, const char *name)
doveadm_cmd_param_get(int argc, const struct doveadm_cmd_param *params,
const char *name)
{
i_assert(params != NULL);
for(int i = 0; i < argc; i++) {
Expand All @@ -196,72 +197,78 @@ doveadm_cmd_param_get(int argc, const struct doveadm_cmd_param* params, const ch
return NULL;
}

bool doveadm_cmd_param_bool(int argc, const struct doveadm_cmd_param* params, const char *name, bool* value)
bool doveadm_cmd_param_bool(int argc, const struct doveadm_cmd_param *params,
const char *name, bool *value_r)
{
const struct doveadm_cmd_param* param;
const struct doveadm_cmd_param *param;
if ((param = doveadm_cmd_param_get(argc, params, name))==NULL) return FALSE;

if (param->type == CMD_PARAM_BOOL) {
*value = param->value.v_bool;
*value_r = param->value.v_bool;
return TRUE;
}
return FALSE;
}

bool doveadm_cmd_param_int64(int argc, const struct doveadm_cmd_param* params, const char *name, int64_t* value)
bool doveadm_cmd_param_int64(int argc, const struct doveadm_cmd_param *params,
const char *name, int64_t *value_r)
{
const struct doveadm_cmd_param* param;
const struct doveadm_cmd_param *param;
if ((param = doveadm_cmd_param_get(argc, params, name))==NULL) return FALSE;

if (param->type == CMD_PARAM_INT64) {
*value = param->value.v_int64;
*value_r = param->value.v_int64;
return TRUE;
}
return FALSE;
}

bool doveadm_cmd_param_str(int argc, const struct doveadm_cmd_param* params, const char *name, const char** value)
bool doveadm_cmd_param_str(int argc, const struct doveadm_cmd_param *params,
const char *name, const char **value_r)
{
const struct doveadm_cmd_param* param;
const struct doveadm_cmd_param *param;
if ((param = doveadm_cmd_param_get(argc, params, name))==NULL) return FALSE;

if (param->type == CMD_PARAM_STR) {
*value = param->value.v_string;
*value_r = param->value.v_string;
return TRUE;
}
return FALSE;
}

bool doveadm_cmd_param_ip(int argc, const struct doveadm_cmd_param* params, const char *name, struct ip* value)
bool doveadm_cmd_param_ip(int argc, const struct doveadm_cmd_param *params,
const char *name, struct ip_addr *value_r)
{
const struct doveadm_cmd_param* param;
const struct doveadm_cmd_param *param;
if ((param = doveadm_cmd_param_get(argc, params, name))==NULL) return FALSE;

if (param->type == CMD_PARAM_IP) {
memcpy(value, &param->value.v_ip, sizeof(struct ip_addr));
memcpy(value_r, &param->value.v_ip, sizeof(struct ip_addr));
return TRUE;
}
return FALSE;
}

bool doveadm_cmd_param_array(int argc, const struct doveadm_cmd_param* params, const char *name, ARRAY_TYPE(const_string)** value)
bool doveadm_cmd_param_array(int argc, const struct doveadm_cmd_param *params,
const char *name, ARRAY_TYPE(const_string) **value_r)
{
const struct doveadm_cmd_param* param;
const struct doveadm_cmd_param *param;
if ((param = doveadm_cmd_param_get(argc, params, name))==NULL) return FALSE;
if (param->type == CMD_PARAM_ARRAY) {
*value = (ARRAY_TYPE(const_string)*)&(param->value.v_array);
*value_r = (ARRAY_TYPE(const_string)*)&(param->value.v_array);
return TRUE;
}
return FALSE;
}

bool doveadm_cmd_param_istream(int argc, const struct doveadm_cmd_param* params, const char *name, struct istream** value)
bool doveadm_cmd_param_istream(int argc, const struct doveadm_cmd_param *params,
const char *name, struct istream **value_r)
{
const struct doveadm_cmd_param* param;
const struct doveadm_cmd_param *param;
if ((param = doveadm_cmd_param_get(argc, params, name))==NULL) return FALSE;

if (param->type == CMD_PARAM_ISTREAM) {
*value = param->value.v_istream;
*value_r = param->value.v_istream;
return TRUE;
}
return FALSE;
Expand Down
18 changes: 12 additions & 6 deletions src/doveadm/doveadm-cmd.h
View file
Expand Up @@ -116,12 +116,18 @@ bool doveadm_cmd_try_run_ver2(const char *cmd_name, int argc,
int doveadm_cmd_run_ver2(const struct doveadm_cmd_ver2 *cmd,
int argc, const char *argv[]);

bool doveadm_cmd_param_bool(int argc, const struct doveadm_cmd_param* params, const char *name, bool* value);
bool doveadm_cmd_param_int64(int argc, const struct doveadm_cmd_param* params, const char *name, int64_t* value);
bool doveadm_cmd_param_str(int argc, const struct doveadm_cmd_param* params, const char *name, const char** value);
bool doveadm_cmd_param_ip(int argc, const struct doveadm_cmd_param* params, const char *name, struct ip_addr *ip);
bool doveadm_cmd_param_array(int argc, const struct doveadm_cmd_param* params, const char *name, ARRAY_TYPE(const_string)** value);
bool doveadm_cmd_param_istream(int argc, const struct doveadm_cmd_param* params, const char *name, struct istream** value);
bool doveadm_cmd_param_bool(int argc, const struct doveadm_cmd_param *params,
const char *name, bool *value_r);
bool doveadm_cmd_param_int64(int argc, const struct doveadm_cmd_param *params,
const char *name, int64_t *value_r);
bool doveadm_cmd_param_str(int argc, const struct doveadm_cmd_param *params,
const char *name, const char **value_r);
bool doveadm_cmd_param_ip(int argc, const struct doveadm_cmd_param *params,
const char *name, struct ip_addr *value_r);
bool doveadm_cmd_param_array(int argc, const struct doveadm_cmd_param *params,
const char *name, ARRAY_TYPE(const_string) **value_r);
bool doveadm_cmd_param_istream(int argc, const struct doveadm_cmd_param *params,
const char *name, struct istream **value_r);

void doveadm_cmd_params_clean(ARRAY_TYPE(doveadm_cmd_param_arr_t) *pargv);

Expand Down

0 comments on commit db8b229

Please sign in to comment.