mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-05 22:20:24 -08:00
Avoid some strlen work, primarily via strnlen
* admin/merge-gnulib (GNULIB_MODULES): Add strnlen. * lib-src/etags.c (find_entries): * src/emacs.c (main): * src/nsmenu.m (parseKeyEquiv:): * src/nsterm.m (ns_xlfd_to_fontname): * src/term.c (vfatal): Prefer !*X to !strlen (X). * lib-src/etags.c (pfnote, add_regex): * lib-src/pop.c (pop_open): * lib-src/update-game-score.c (main): * lwlib/lwlib.c (lw_separator_p): * src/doprnt.c (doprnt): * src/emacs.c (main): * src/inotify.c (inotifyevent_to_event): * src/keyboard.c (menu_separator_name_p, parse_tool_bar_item): * src/sysdep.c (get_current_dir_name_or_unreachable): * src/xdisp.c (store_mode_line_string): Use strnlen to avoid unnecessary work with strlen. * lib-src/etags.c (Prolog_functions, prolog_pr) (Erlang_functions, erlang_func): Prefer ptrdiff_t to size_t when either will do. (prolog_pr, erlang_func): New arg LASTLEN, to avoid unnecessary strlen call. All callers changed. * lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate. * lib/strnlen.c, m4/strnlen.m4: New files, copied from Gnulib. * lwlib/lwlib.c (lw_separator_p): * src/json.c (json_has_prefix): Use strncmp to avoid unecessary work with strlen + memcmp. * src/process.c (set_socket_option): Use SBYTES instead of strlen.
This commit is contained in:
parent
349b778dde
commit
d7c6836288
20 changed files with 174 additions and 127 deletions
|
|
@ -285,7 +285,7 @@ pop_open (char *host, char *username, char *password, int flags)
|
|||
/*
|
||||
* I really shouldn't use the pop_error variable like this, but....
|
||||
*/
|
||||
if (strlen (username) > ERROR_MAX - 6)
|
||||
if (strnlen (username, ERROR_MAX - 6 + 1) == ERROR_MAX - 6 + 1)
|
||||
{
|
||||
pop_close (server);
|
||||
strcpy (pop_error,
|
||||
|
|
@ -299,7 +299,7 @@ pop_open (char *host, char *username, char *password, int flags)
|
|||
return (0);
|
||||
}
|
||||
|
||||
if (strlen (password) > ERROR_MAX - 6)
|
||||
if (strnlen (password, ERROR_MAX - 6 + 1) == ERROR_MAX - 6 + 1)
|
||||
{
|
||||
pop_close (server);
|
||||
strcpy (pop_error,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue