UI code style cleanup
Mostly condition check changes. Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2047)
This commit is contained in:
Richard Levitte
parent
141ecc4e55
commit
120fb9e436
2 changed files with 70 additions and 66 deletions
|
|
@ -124,7 +124,7 @@ static int general_allocate_string(UI *ui, const char *prompt,
|
|||
UI_STRING *s = general_allocate_prompt(ui, prompt, prompt_freeable,
|
||||
type, input_flags, result_buf);
|
||||
|
||||
if (s) {
|
||||
if (s != NULL) {
|
||||
if (allocate_string_stack(ui) >= 0) {
|
||||
s->_.string_data.result_minsize = minsize;
|
||||
s->_.string_data.result_maxsize = maxsize;
|
||||
|
|
@ -159,8 +159,8 @@ static int general_allocate_boolean(UI *ui,
|
|||
} else if (cancel_chars == NULL) {
|
||||
UIerr(UI_F_GENERAL_ALLOCATE_BOOLEAN, ERR_R_PASSED_NULL_PARAMETER);
|
||||
} else {
|
||||
for (p = ok_chars; *p; p++) {
|
||||
if (strchr(cancel_chars, *p)) {
|
||||
for (p = ok_chars; *p != '\0'; p++) {
|
||||
if (strchr(cancel_chars, *p) != NULL) {
|
||||
UIerr(UI_F_GENERAL_ALLOCATE_BOOLEAN,
|
||||
UI_R_COMMON_OK_AND_CANCEL_CHARACTERS);
|
||||
}
|
||||
|
|
@ -169,7 +169,7 @@ static int general_allocate_boolean(UI *ui,
|
|||
s = general_allocate_prompt(ui, prompt, prompt_freeable,
|
||||
type, input_flags, result_buf);
|
||||
|
||||
if (s) {
|
||||
if (s != NULL) {
|
||||
if (allocate_string_stack(ui) >= 0) {
|
||||
s->_.boolean_data.action_desc = action_desc;
|
||||
s->_.boolean_data.ok_chars = ok_chars;
|
||||
|
|
@ -207,7 +207,7 @@ int UI_dup_input_string(UI *ui, const char *prompt, int flags,
|
|||
{
|
||||
char *prompt_copy = NULL;
|
||||
|
||||
if (prompt) {
|
||||
if (prompt != NULL) {
|
||||
prompt_copy = OPENSSL_strdup(prompt);
|
||||
if (prompt_copy == NULL) {
|
||||
UIerr(UI_F_UI_DUP_INPUT_STRING, ERR_R_MALLOC_FAILURE);
|
||||
|
|
@ -235,7 +235,7 @@ int UI_dup_verify_string(UI *ui, const char *prompt, int flags,
|
|||
{
|
||||
char *prompt_copy = NULL;
|
||||
|
||||
if (prompt) {
|
||||
if (prompt != NULL) {
|
||||
prompt_copy = OPENSSL_strdup(prompt);
|
||||
if (prompt_copy == NULL) {
|
||||
UIerr(UI_F_UI_DUP_VERIFY_STRING, ERR_R_MALLOC_FAILURE);
|
||||
|
|
@ -266,7 +266,7 @@ int UI_dup_input_boolean(UI *ui, const char *prompt, const char *action_desc,
|
|||
char *ok_chars_copy = NULL;
|
||||
char *cancel_chars_copy = NULL;
|
||||
|
||||
if (prompt) {
|
||||
if (prompt != NULL) {
|
||||
prompt_copy = OPENSSL_strdup(prompt);
|
||||
if (prompt_copy == NULL) {
|
||||
UIerr(UI_F_UI_DUP_INPUT_BOOLEAN, ERR_R_MALLOC_FAILURE);
|
||||
|
|
@ -274,7 +274,7 @@ int UI_dup_input_boolean(UI *ui, const char *prompt, const char *action_desc,
|
|||
}
|
||||
}
|
||||
|
||||
if (action_desc) {
|
||||
if (action_desc != NULL) {
|
||||
action_desc_copy = OPENSSL_strdup(action_desc);
|
||||
if (action_desc_copy == NULL) {
|
||||
UIerr(UI_F_UI_DUP_INPUT_BOOLEAN, ERR_R_MALLOC_FAILURE);
|
||||
|
|
@ -282,7 +282,7 @@ int UI_dup_input_boolean(UI *ui, const char *prompt, const char *action_desc,
|
|||
}
|
||||
}
|
||||
|
||||
if (ok_chars) {
|
||||
if (ok_chars != NULL) {
|
||||
ok_chars_copy = OPENSSL_strdup(ok_chars);
|
||||
if (ok_chars_copy == NULL) {
|
||||
UIerr(UI_F_UI_DUP_INPUT_BOOLEAN, ERR_R_MALLOC_FAILURE);
|
||||
|
|
@ -290,7 +290,7 @@ int UI_dup_input_boolean(UI *ui, const char *prompt, const char *action_desc,
|
|||
}
|
||||
}
|
||||
|
||||
if (cancel_chars) {
|
||||
if (cancel_chars != NULL) {
|
||||
cancel_chars_copy = OPENSSL_strdup(cancel_chars);
|
||||
if (cancel_chars_copy == NULL) {
|
||||
UIerr(UI_F_UI_DUP_INPUT_BOOLEAN, ERR_R_MALLOC_FAILURE);
|
||||
|
|
@ -319,7 +319,7 @@ int UI_dup_info_string(UI *ui, const char *text)
|
|||
{
|
||||
char *text_copy = NULL;
|
||||
|
||||
if (text) {
|
||||
if (text != NULL) {
|
||||
text_copy = OPENSSL_strdup(text);
|
||||
if (text_copy == NULL) {
|
||||
UIerr(UI_F_UI_DUP_INFO_STRING, ERR_R_MALLOC_FAILURE);
|
||||
|
|
@ -341,7 +341,7 @@ int UI_dup_error_string(UI *ui, const char *text)
|
|||
{
|
||||
char *text_copy = NULL;
|
||||
|
||||
if (text) {
|
||||
if (text != NULL) {
|
||||
text_copy = OPENSSL_strdup(text);
|
||||
if (text_copy == NULL) {
|
||||
UIerr(UI_F_UI_DUP_ERROR_STRING, ERR_R_MALLOC_FAILURE);
|
||||
|
|
@ -357,7 +357,7 @@ char *UI_construct_prompt(UI *ui, const char *object_desc,
|
|||
{
|
||||
char *prompt = NULL;
|
||||
|
||||
if (ui->meth->ui_construct_prompt)
|
||||
if (ui->meth->ui_construct_prompt != NULL)
|
||||
prompt = ui->meth->ui_construct_prompt(ui, object_desc, object_name);
|
||||
else {
|
||||
char prompt1[] = "Enter ";
|
||||
|
|
@ -368,7 +368,7 @@ char *UI_construct_prompt(UI *ui, const char *object_desc,
|
|||
if (object_desc == NULL)
|
||||
return NULL;
|
||||
len = sizeof(prompt1) - 1 + strlen(object_desc);
|
||||
if (object_name)
|
||||
if (object_name != NULL)
|
||||
len += sizeof(prompt2) - 1 + strlen(object_name);
|
||||
len += sizeof(prompt3) - 1;
|
||||
|
||||
|
|
@ -377,7 +377,7 @@ char *UI_construct_prompt(UI *ui, const char *object_desc,
|
|||
return NULL;
|
||||
OPENSSL_strlcpy(prompt, prompt1, len + 1);
|
||||
OPENSSL_strlcat(prompt, object_desc, len + 1);
|
||||
if (object_name) {
|
||||
if (object_name != NULL) {
|
||||
OPENSSL_strlcat(prompt, prompt2, len + 1);
|
||||
OPENSSL_strlcat(prompt, object_name, len + 1);
|
||||
}
|
||||
|
|
@ -419,7 +419,8 @@ static int print_error(const char *str, size_t len, UI *ui)
|
|||
uis.type = UIT_ERROR;
|
||||
uis.out_string = str;
|
||||
|
||||
if (ui->meth->ui_write_string && !ui->meth->ui_write_string(ui, &uis))
|
||||
if (ui->meth->ui_write_string != NULL
|
||||
&& ui->meth->ui_write_string(ui, &uis) <= 0)
|
||||
return -1;
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -429,7 +430,8 @@ int UI_process(UI *ui)
|
|||
int i, ok = 0;
|
||||
const char *state = "processing";
|
||||
|
||||
if (ui->meth->ui_open_session && !ui->meth->ui_open_session(ui)) {
|
||||
if (ui->meth->ui_open_session != NULL
|
||||
&& ui->meth->ui_open_session(ui) <= 0) {
|
||||
state = "opening session";
|
||||
ok = -1;
|
||||
goto err;
|
||||
|
|
@ -440,9 +442,10 @@ int UI_process(UI *ui)
|
|||
print_error, (void *)ui);
|
||||
|
||||
for (i = 0; i < sk_UI_STRING_num(ui->strings); i++) {
|
||||
if (ui->meth->ui_write_string
|
||||
&& !ui->meth->ui_write_string(ui,
|
||||
sk_UI_STRING_value(ui->strings, i)))
|
||||
if (ui->meth->ui_write_string != NULL
|
||||
&& (ui->meth->ui_write_string(ui,
|
||||
sk_UI_STRING_value(ui->strings, i))
|
||||
<= 0))
|
||||
{
|
||||
state = "writing strings";
|
||||
ok = -1;
|
||||
|
|
@ -450,7 +453,7 @@ int UI_process(UI *ui)
|
|||
}
|
||||
}
|
||||
|
||||
if (ui->meth->ui_flush)
|
||||
if (ui->meth->ui_flush != NULL)
|
||||
switch (ui->meth->ui_flush(ui)) {
|
||||
case -1: /* Interrupt/Cancel/something... */
|
||||
ok = -2;
|
||||
|
|
@ -465,7 +468,7 @@ int UI_process(UI *ui)
|
|||
}
|
||||
|
||||
for (i = 0; i < sk_UI_STRING_num(ui->strings); i++) {
|
||||
if (ui->meth->ui_read_string) {
|
||||
if (ui->meth->ui_read_string != NULL) {
|
||||
switch (ui->meth->ui_read_string(ui,
|
||||
sk_UI_STRING_value(ui->strings,
|
||||
i))) {
|
||||
|
|
@ -483,7 +486,8 @@ int UI_process(UI *ui)
|
|||
}
|
||||
}
|
||||
err:
|
||||
if (ui->meth->ui_close_session && !ui->meth->ui_close_session(ui)) {
|
||||
if (ui->meth->ui_close_session != NULL
|
||||
&& !ui->meth->ui_close_session(ui) <= 0) {
|
||||
if (state == NULL)
|
||||
state = "closing session";
|
||||
ok = -1;
|
||||
|
|
@ -584,49 +588,49 @@ void UI_destroy_method(UI_METHOD *ui_method)
|
|||
|
||||
int UI_method_set_opener(UI_METHOD *method, int (*opener) (UI *ui))
|
||||
{
|
||||
if (method) {
|
||||
if (method != NULL) {
|
||||
method->ui_open_session = opener;
|
||||
return 0;
|
||||
} else
|
||||
return -1;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
int UI_method_set_writer(UI_METHOD *method,
|
||||
int (*writer) (UI *ui, UI_STRING *uis))
|
||||
{
|
||||
if (method) {
|
||||
if (method != NULL) {
|
||||
method->ui_write_string = writer;
|
||||
return 0;
|
||||
} else
|
||||
return -1;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
int UI_method_set_flusher(UI_METHOD *method, int (*flusher) (UI *ui))
|
||||
{
|
||||
if (method) {
|
||||
if (method != NULL) {
|
||||
method->ui_flush = flusher;
|
||||
return 0;
|
||||
} else
|
||||
return -1;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
int UI_method_set_reader(UI_METHOD *method,
|
||||
int (*reader) (UI *ui, UI_STRING *uis))
|
||||
{
|
||||
if (method) {
|
||||
if (method != NULL) {
|
||||
method->ui_read_string = reader;
|
||||
return 0;
|
||||
} else
|
||||
return -1;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
int UI_method_set_closer(UI_METHOD *method, int (*closer) (UI *ui))
|
||||
{
|
||||
if (method) {
|
||||
if (method != NULL) {
|
||||
method->ui_close_session = closer;
|
||||
return 0;
|
||||
} else
|
||||
return -1;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
int UI_method_set_prompt_constructor(UI_METHOD *method,
|
||||
|
|
@ -636,55 +640,55 @@ int UI_method_set_prompt_constructor(UI_METHOD *method,
|
|||
const char
|
||||
*object_name))
|
||||
{
|
||||
if (method) {
|
||||
if (method != NULL) {
|
||||
method->ui_construct_prompt = prompt_constructor;
|
||||
return 0;
|
||||
} else
|
||||
return -1;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
int (*UI_method_get_opener(UI_METHOD *method)) (UI *) {
|
||||
if (method)
|
||||
int (*UI_method_get_opener(UI_METHOD *method)) (UI *)
|
||||
{
|
||||
if (method != NULL)
|
||||
return method->ui_open_session;
|
||||
else
|
||||
return NULL;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int (*UI_method_get_writer(UI_METHOD *method)) (UI *, UI_STRING *) {
|
||||
if (method)
|
||||
int (*UI_method_get_writer(UI_METHOD *method)) (UI *, UI_STRING *)
|
||||
{
|
||||
if (method != NULL)
|
||||
return method->ui_write_string;
|
||||
else
|
||||
return NULL;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int (*UI_method_get_flusher(UI_METHOD *method)) (UI *) {
|
||||
if (method)
|
||||
int (*UI_method_get_flusher(UI_METHOD *method)) (UI *)
|
||||
{
|
||||
if (method != NULL)
|
||||
return method->ui_flush;
|
||||
else
|
||||
return NULL;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int (*UI_method_get_reader(UI_METHOD *method)) (UI *, UI_STRING *) {
|
||||
if (method)
|
||||
int (*UI_method_get_reader(UI_METHOD *method)) (UI *, UI_STRING *)
|
||||
{
|
||||
if (method != NULL)
|
||||
return method->ui_read_string;
|
||||
else
|
||||
return NULL;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int (*UI_method_get_closer(UI_METHOD *method)) (UI *) {
|
||||
if (method)
|
||||
int (*UI_method_get_closer(UI_METHOD *method)) (UI *)
|
||||
{
|
||||
if (method != NULL)
|
||||
return method->ui_close_session;
|
||||
else
|
||||
return NULL;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
char *(*UI_method_get_prompt_constructor(UI_METHOD *method)) (UI *,
|
||||
const char *,
|
||||
const char *) {
|
||||
if (method)
|
||||
const char *)
|
||||
{
|
||||
if (method != NULL)
|
||||
return method->ui_construct_prompt;
|
||||
else
|
||||
return NULL;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
enum UI_string_types UI_get_string_type(UI_STRING *uis)
|
||||
|
|
|
|||
|
|
@ -349,7 +349,7 @@ static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl)
|
|||
} else
|
||||
# endif
|
||||
p = fgets(result, maxsize, tty_in);
|
||||
if (!p)
|
||||
if (p == NULL)
|
||||
goto error;
|
||||
if (feof(tty_in))
|
||||
goto error;
|
||||
|
|
|
|||
Loading…
Reference in a new issue