mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-15 15:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

api_set_error(): rename

Browse Source
This commit is contained in:
Justin M. Keyes
2017-04-23 21:54:44 +02:00
parent 2ed91f222f
commit 3fbc660d57
8 changed files with 94 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/nvim/api/private/helpers.c
View File

@@ -61,7 +61,7 @@ bool try_end(Error *err)
discard_current_exception();
}
_api_set_error(err, kErrorTypeException, _("Keyboard interrupt"));
api_set_error(err, kErrorTypeException, _("Keyboard interrupt"));
got_int = false;
} else if (msg_list != NULL && *msg_list != NULL) {
int should_free;
@@ -69,14 +69,14 @@ bool try_end(Error *err)
ET_ERROR,
NULL,
&should_free);
_api_set_error(err, kErrorTypeException, "%s", msg);
api_set_error(err, kErrorTypeException, "%s", msg);
free_global_msglist();
if (should_free) {
xfree(msg);
}
} else if (did_throw) {
_api_set_error(err, kErrorTypeException, "%s", current_exception->value);
api_set_error(err, kErrorTypeException, "%s", current_exception->value);
discard_current_exception();
}
@@ -93,7 +93,7 @@ Object dict_get_value(dict_T *dict, String key, Error *err)
dictitem_T *const di = tv_dict_find(dict, key.data, (ptrdiff_t)key.size);
if (di == NULL) {
_api_set_error(err, kErrorTypeValidation, _("Key not found"));
api_set_error(err, kErrorTypeValidation, _("Key not found"));
return (Object) OBJECT_INIT;
}
@@ -117,17 +117,17 @@ Object dict_set_var(dict_T *dict, String key, Object value, bool del,
Object rv = OBJECT_INIT;
if (dict->dv_lock) {
_api_set_error(err, kErrorTypeException, _("Dictionary is locked"));
api_set_error(err, kErrorTypeException, _("Dictionary is locked"));
return rv;
}
if (key.size == 0) {
_api_set_error(err, kErrorTypeValidation, _("Empty variable names aren't allowed"));
api_set_error(err, kErrorTypeValidation, _("Empty variable names aren't allowed"));
return rv;
}
if (key.size > INT_MAX) {
_api_set_error(err, kErrorTypeValidation, _("Key length is too high"));
api_set_error(err, kErrorTypeValidation, _("Key length is too high"));
return rv;
}
@@ -135,13 +135,13 @@ Object dict_set_var(dict_T *dict, String key, Object value, bool del,
if (di != NULL) {
if (di->di_flags & DI_FLAGS_RO) {
_api_set_error(err, kErrorTypeException, _("Key is read-only: %s"), key.data);
api_set_error(err, kErrorTypeException, _("Key is read-only: %s"), key.data);
return rv;
} else if (di->di_flags & DI_FLAGS_FIX) {
_api_set_error(err, kErrorTypeException, _("Key is fixed: %s"), key.data);
api_set_error(err, kErrorTypeException, _("Key is fixed: %s"), key.data);
return rv;
} else if (di->di_flags & DI_FLAGS_LOCK) {
_api_set_error(err, kErrorTypeException, _("Key is locked: %s"), key.data);
api_set_error(err, kErrorTypeException, _("Key is locked: %s"), key.data);
return rv;
}
}
@@ -150,7 +150,7 @@ Object dict_set_var(dict_T *dict, String key, Object value, bool del,
// Delete the key
if (di == NULL) {
// Doesn't exist, fail
_api_set_error(err, kErrorTypeValidation, _("Key \"%s\" doesn't exist"), key.data);
api_set_error(err, kErrorTypeValidation, _("Key \"%s\" doesn't exist"), key.data);
} else {
// Return the old value
if (retval) {
@@ -202,7 +202,7 @@ Object get_option_from(void *from, int type, String name, Error *err)
Object rv = OBJECT_INIT;
if (name.size == 0) {
_api_set_error(err, kErrorTypeValidation, _("Empty option name"));
api_set_error(err, kErrorTypeValidation, _("Empty option name"));
return rv;
}
@@ -213,7 +213,7 @@ Object get_option_from(void *from, int type, String name, Error *err)
type, from);
if (!flags) {
_api_set_error(err,
api_set_error(err,
kErrorTypeValidation,
_("Invalid option name \"%s\""),
name.data);
@@ -232,13 +232,13 @@ Object get_option_from(void *from, int type, String name, Error *err)
rv.data.string.data = stringval;
rv.data.string.size = strlen(stringval);
} else {
_api_set_error(err,
api_set_error(err,
kErrorTypeException,
_("Unable to get value for option \"%s\""),
name.data);
}
} else {
_api_set_error(err,
api_set_error(err,
kErrorTypeException,
_("Unknown type for option \"%s\""),
name.data);
@@ -257,14 +257,14 @@ Object get_option_from(void *from, int type, String name, Error *err)
void set_option_to(void *to, int type, String name, Object value, Error *err)
{
if (name.size == 0) {
_api_set_error(err, kErrorTypeValidation, _("Empty option name"));
api_set_error(err, kErrorTypeValidation, _("Empty option name"));
return;
}
int flags = get_option_value_strict(name.data, NULL, NULL, type, to);
if (flags == 0) {
_api_set_error(err,
api_set_error(err,
kErrorTypeValidation,
_("Invalid option name \"%s\""),
name.data);
@@ -273,13 +273,13 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
if (value.type == kObjectTypeNil) {
if (type == SREQ_GLOBAL) {
_api_set_error(err,
api_set_error(err,
kErrorTypeException,
_("Unable to unset option \"%s\""),
name.data);
return;
} else if (!(flags & SOPT_GLOBAL)) {
_api_set_error(err,
api_set_error(err,
kErrorTypeException,
_("Cannot unset option \"%s\" "
"because it doesn't have a global value"),
@@ -295,7 +295,7 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
if (flags & SOPT_BOOL) {
if (value.type != kObjectTypeBoolean) {
_api_set_error(err,
api_set_error(err,
kErrorTypeValidation,
_("Option \"%s\" requires a boolean value"),
name.data);
@@ -306,7 +306,7 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
set_option_value_for(name.data, val, NULL, opt_flags, type, to, err);
} else if (flags & SOPT_NUM) {
if (value.type != kObjectTypeInteger) {
_api_set_error(err,
api_set_error(err,
kErrorTypeValidation,
_("Option \"%s\" requires an integer value"),
name.data);
@@ -314,7 +314,7 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
}
if (value.data.integer > INT_MAX || value.data.integer < INT_MIN) {
_api_set_error(err,
api_set_error(err,
kErrorTypeValidation,
_("Value for option \"%s\" is outside range"),
name.data);
@@ -325,7 +325,7 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
set_option_value_for(name.data, val, NULL, opt_flags, type, to, err);
} else {
if (value.type != kObjectTypeString) {
_api_set_error(err,
api_set_error(err,
kErrorTypeValidation,
_("Option \"%s\" requires a string value"),
name.data);
@@ -560,7 +560,7 @@ buf_T *find_buffer_by_handle(Buffer buffer, Error *err)
buf_T *rv = handle_get_buffer(buffer);
if (!rv) {
_api_set_error(err, kErrorTypeValidation, _("Invalid buffer id"));
api_set_error(err, kErrorTypeValidation, _("Invalid buffer id"));
}
return rv;
@@ -575,7 +575,7 @@ win_T *find_window_by_handle(Window window, Error *err)
win_T *rv = handle_get_window(window);
if (!rv) {
_api_set_error(err, kErrorTypeValidation, _("Invalid window id"));
api_set_error(err, kErrorTypeValidation, _("Invalid window id"));
}
return rv;
@@ -590,7 +590,7 @@ tabpage_T *find_tab_by_handle(Tabpage tabpage, Error *err)
tabpage_T *rv = handle_get_tabpage(tabpage);
if (!rv) {
_api_set_error(err, kErrorTypeValidation, _("Invalid tabpage id"));
api_set_error(err, kErrorTypeValidation, _("Invalid tabpage id"));
}
return rv;
@@ -658,7 +658,7 @@ bool object_to_vim(Object obj, typval_T *tv, Error *err)
case kObjectTypeInteger:
if (obj.data.integer > VARNUMBER_MAX
|| obj.data.integer < VARNUMBER_MIN) {
_api_set_error(err, kErrorTypeValidation, _("Integer value outside range"));
api_set_error(err, kErrorTypeValidation, _("Integer value outside range"));
return false;
}
@@ -712,7 +712,7 @@ bool object_to_vim(Object obj, typval_T *tv, Error *err)
String key = item.key;
if (key.size == 0) {
_api_set_error(err, kErrorTypeValidation,
api_set_error(err, kErrorTypeValidation,
_("Empty dictionary keys aren't allowed"));
// cleanup
tv_dict_free(dict);
@@ -936,7 +936,7 @@ static void set_option_value_for(char *key,
if (try_end(err)) {
return;
}
_api_set_error(err,
api_set_error(err,
kErrorTypeException,
_("Problem while switching windows"));
return;
@@ -975,11 +975,11 @@ static void set_option_value_err(char *key,
return;
}
_api_set_error(err, kErrorTypeException, "%s", errmsg);
api_set_error(err, kErrorTypeException, "%s", errmsg);
}
}
void _api_set_error(Error *err, ErrorType errType, const char *format, ...)
void api_set_error(Error *err, ErrorType errType, const char *format, ...)
FUNC_ATTR_NONNULL_ALL
{
assert(kErrorTypeNone != errType);