aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-30 04:44:14 -04:00
Code Activity

patch 9.0.0450: return value of argument check functions is inconsistent

Browse Source 
Problem:    Return value of argument check functions is inconsistent.
Solution:   Return OK/FAIL instead of TRUE/FALSE. (closes #11112)
This commit is contained in:
zeertzjq
2022-09-12 14:09:30 +01:00
committed by Bram Moolenaar
parent cdc839353f
commit cd2d5c181a
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/typval.c
View File

@@ -410,7 +410,7 @@ check_for_nonempty_string_arg(typval_T *args, int idx)
check_for_opt_string_arg(typval_T *args, int idx) check_for_opt_string_arg(typval_T *args, int idx)
{ {
return (args[idx].v_type == VAR_UNKNOWN return (args[idx].v_type == VAR_UNKNOWN
|| check_for_string_arg(args, idx) != FAIL); || check_for_string_arg(args, idx) != FAIL) ? OK : FAIL;
} }
/* /*
@@ -434,7 +434,7 @@ check_for_number_arg(typval_T *args, int idx)
check_for_opt_number_arg(typval_T *args, int idx) check_for_opt_number_arg(typval_T *args, int idx)
{ {
return (args[idx].v_type == VAR_UNKNOWN return (args[idx].v_type == VAR_UNKNOWN
|| check_for_number_arg(args, idx) != FAIL); || check_for_number_arg(args, idx) != FAIL) ? OK : FAIL;
} }
/* /*
@@ -532,7 +532,7 @@ check_for_nonnull_list_arg(typval_T *args, int idx)
check_for_opt_list_arg(typval_T *args, int idx) check_for_opt_list_arg(typval_T *args, int idx)
{ {
return (args[idx].v_type == VAR_UNKNOWN return (args[idx].v_type == VAR_UNKNOWN
|| check_for_list_arg(args, idx) != FAIL); || check_for_list_arg(args, idx) != FAIL) ? OK : FAIL;
} }
/* /*
@@ -573,7 +573,7 @@ check_for_nonnull_dict_arg(typval_T *args, int idx)
check_for_opt_dict_arg(typval_T *args, int idx) check_for_opt_dict_arg(typval_T *args, int idx)
{ {
return (args[idx].v_type == VAR_UNKNOWN return (args[idx].v_type == VAR_UNKNOWN
|| check_for_dict_arg(args, idx) != FAIL); || check_for_dict_arg(args, idx) != FAIL) ? OK : FAIL;
} }
#if defined(FEAT_JOB_CHANNEL) || defined(PROTO) #if defined(FEAT_JOB_CHANNEL) || defined(PROTO)
@@ -599,7 +599,7 @@ check_for_chan_or_job_arg(typval_T *args, int idx)
check_for_opt_chan_or_job_arg(typval_T *args, int idx) check_for_opt_chan_or_job_arg(typval_T *args, int idx)
{ {
return (args[idx].v_type == VAR_UNKNOWN return (args[idx].v_type == VAR_UNKNOWN
|| check_for_chan_or_job_arg(args, idx) != FAIL); || check_for_chan_or_job_arg(args, idx) != FAIL) ? OK : FAIL;
} }
/* /*
@@ -623,7 +623,7 @@ check_for_job_arg(typval_T *args, int idx)
check_for_opt_job_arg(typval_T *args, int idx) check_for_opt_job_arg(typval_T *args, int idx)
{ {
return (args[idx].v_type == VAR_UNKNOWN return (args[idx].v_type == VAR_UNKNOWN
|| check_for_job_arg(args, idx) != FAIL); || check_for_job_arg(args, idx) != FAIL) ? OK : FAIL;
} }
#endif #endif
@@ -649,7 +649,7 @@ check_for_string_or_number_arg(typval_T *args, int idx)
check_for_opt_string_or_number_arg(typval_T *args, int idx) check_for_opt_string_or_number_arg(typval_T *args, int idx)
{ {
return (args[idx].v_type == VAR_UNKNOWN return (args[idx].v_type == VAR_UNKNOWN
|| check_for_string_or_number_arg(args, idx) != FAIL); || check_for_string_or_number_arg(args, idx) != FAIL) ? OK : FAIL;
} }
/* /*
@@ -669,7 +669,7 @@ check_for_buffer_arg(typval_T *args, int idx)
check_for_opt_buffer_arg(typval_T *args, int idx) check_for_opt_buffer_arg(typval_T *args, int idx)
{ {
return (args[idx].v_type == VAR_UNKNOWN return (args[idx].v_type == VAR_UNKNOWN
|| check_for_buffer_arg(args, idx)); || check_for_buffer_arg(args, idx) != FAIL) ? OK : FAIL;
} }
/* /*
@@ -689,7 +689,7 @@ check_for_lnum_arg(typval_T *args, int idx)
check_for_opt_lnum_arg(typval_T *args, int idx) check_for_opt_lnum_arg(typval_T *args, int idx)
{ {
return (args[idx].v_type == VAR_UNKNOWN return (args[idx].v_type == VAR_UNKNOWN
|| check_for_lnum_arg(args, idx)); || check_for_lnum_arg(args, idx) != FAIL) ? OK : FAIL;
} }
#if defined(FEAT_JOB_CHANNEL) || defined(PROTO) #if defined(FEAT_JOB_CHANNEL) || defined(PROTO)
@@ -746,7 +746,7 @@ check_for_string_or_list_or_blob_arg(typval_T *args, int idx)
check_for_opt_string_or_list_arg(typval_T *args, int idx) check_for_opt_string_or_list_arg(typval_T *args, int idx)
{ {
return (args[idx].v_type == VAR_UNKNOWN return (args[idx].v_type == VAR_UNKNOWN
|| check_for_string_or_list_arg(args, idx)); || check_for_string_or_list_arg(args, idx) != FAIL) ? OK : FAIL;
} }
/* /*
@@ -788,7 +788,8 @@ check_for_string_or_number_or_list_arg(typval_T *args, int idx)
check_for_opt_string_or_number_or_list_arg(typval_T *args, int idx) check_for_opt_string_or_number_or_list_arg(typval_T *args, int idx)
{ {
return (args[idx].v_type == VAR_UNKNOWN return (args[idx].v_type == VAR_UNKNOWN
|| check_for_string_or_number_or_list_arg(args, idx) != FAIL); || check_for_string_or_number_or_list_arg(args, idx)
!= FAIL) ? OK : FAIL;
} }
/* /*

2
src/version.c
View File

@@ -703,6 +703,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
450,
/**/ /**/
449, 449,
/**/ /**/