diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2019-09-13 17:23:02 -0700 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2019-09-13 19:13:00 -0700 |
commit | 0a24a2c314a507108be754a0a2d2ed1a16ec523f (patch) | |
tree | 8228647f9e05e479884b838ef10de28ef3c2dd3d /src | |
parent | 427cf16e44d047c14e0ca1b95eb09fc8b8eb2f3d (diff) | |
download | rneovim-0a24a2c314a507108be754a0a2d2ed1a16ec523f.tar.gz rneovim-0a24a2c314a507108be754a0a2d2ed1a16ec523f.tar.bz2 rneovim-0a24a2c314a507108be754a0a2d2ed1a16ec523f.zip |
rename: getdigits_safe => try_getdigits
Diffstat (limited to 'src')
-rw-r--r-- | src/nvim/buffer.c | 2 | ||||
-rw-r--r-- | src/nvim/charset.c | 14 | ||||
-rw-r--r-- | src/nvim/event/socket.c | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index 8fd4360aed..056fe9e1e5 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -5078,7 +5078,7 @@ chk_modeline( } else { e = s + 3; } - if (getdigits_safe(&e, &vers) != OK) { + if (!try_getdigits(&e, &vers)) { continue; } diff --git a/src/nvim/charset.c b/src/nvim/charset.c index 1dec0beeee..0587630336 100644 --- a/src/nvim/charset.c +++ b/src/nvim/charset.c @@ -1601,18 +1601,18 @@ char_u* skiptowhite_esc(char_u *p) { /// It will be advanced past the read number. /// @param[out] nr Number read from the string. /// -/// @return OK on success, FAIL on error/overflow -int getdigits_safe(char_u **pp, intmax_t *nr) +/// @return true on success, false on error/overflow +bool try_getdigits(char_u **pp, intmax_t *nr) { errno = 0; *nr = strtoimax((char *)(*pp), (char **)pp, 10); if ((*nr == INTMAX_MIN || *nr == INTMAX_MAX) && errno == ERANGE) { - return FAIL; + return false; } - return OK; + return true; } /// Get a number from a string and skip over it. @@ -1624,10 +1624,10 @@ int getdigits_safe(char_u **pp, intmax_t *nr) intmax_t getdigits(char_u **pp) { intmax_t number; - int ret = getdigits_safe(pp, &number); + int ok = try_getdigits(pp, &number); - (void)ret; // Avoid "unused variable" warning in Release build - assert(ret == OK); + (void)ok; // Avoid "unused variable" warning in Release build + assert(ok); return number; } diff --git a/src/nvim/event/socket.c b/src/nvim/event/socket.c index af326f9c82..23228aa63a 100644 --- a/src/nvim/event/socket.c +++ b/src/nvim/event/socket.c @@ -40,8 +40,8 @@ int socket_watcher_init(Loop *loop, SocketWatcher *watcher, char *port = host_end + 1; intmax_t iport; - int ret = getdigits_safe(&(char_u *){ (char_u *)port }, &iport); - if (ret == FAIL || iport < 0 || iport > UINT16_MAX) { + int ok = try_getdigits(&(char_u *){ (char_u *)port }, &iport); + if (!ok || iport < 0 || iport > UINT16_MAX) { ELOG("Invalid port: %s", port); return UV_EINVAL; } |