aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2018-04-01 19:59:37 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2018-04-01 19:59:37 +0200
commit899ae5337acc2d24edcd64e570adfc5f3c1a8a8a (patch)
tree9ec3de6ffce8df5f82d1428d595ffe4028905a3d /shell
parente2afae6303e871a31a061d03359cfcd5dd86c088 (diff)
downloadbusybox-w32-899ae5337acc2d24edcd64e570adfc5f3c1a8a8a.tar.gz
busybox-w32-899ae5337acc2d24edcd64e570adfc5f3c1a8a8a.tar.bz2
busybox-w32-899ae5337acc2d24edcd64e570adfc5f3c1a8a8a.zip
libbb: new function bb_die_memory_exhausted
function old new delta bb_die_memory_exhausted - 10 +10 xstrdup 28 23 -5 xsetenv 27 22 -5 xrealloc 32 27 -5 xputenv 22 17 -5 xmalloc 30 25 -5 xfdopen_helper 40 35 -5 xasprintf 44 39 -5 wget_main 2387 2382 -5 open_socket 54 49 -5 glob_brace 419 414 -5 bb_get_chunk_from_file 146 141 -5 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 0/11 up/down: 10/-55) Total: -45 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell')
-rw-r--r--shell/hush.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/shell/hush.c b/shell/hush.c
index 1921932d1..8246b5fd8 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -3158,7 +3158,7 @@ static int glob_brace(char *pattern, o_string *o, int n)
3158 return o_save_ptr_helper(o, n); 3158 return o_save_ptr_helper(o, n);
3159 } 3159 }
3160 if (gr == GLOB_NOSPACE) 3160 if (gr == GLOB_NOSPACE)
3161 bb_error_msg_and_die(bb_msg_memory_exhausted); 3161 bb_die_memory_exhausted();
3162 /* GLOB_ABORTED? Only happens with GLOB_ERR flag, 3162 /* GLOB_ABORTED? Only happens with GLOB_ERR flag,
3163 * but we didn't specify it. Paranoia again. */ 3163 * but we didn't specify it. Paranoia again. */
3164 bb_error_msg_and_die("glob error %d on '%s'", gr, pattern); 3164 bb_error_msg_and_die("glob error %d on '%s'", gr, pattern);
@@ -3260,7 +3260,7 @@ static int perform_glob(o_string *o, int n)
3260 goto literal; 3260 goto literal;
3261 } 3261 }
3262 if (gr == GLOB_NOSPACE) 3262 if (gr == GLOB_NOSPACE)
3263 bb_error_msg_and_die(bb_msg_memory_exhausted); 3263 bb_die_memory_exhausted();
3264 /* GLOB_ABORTED? Only happens with GLOB_ERR flag, 3264 /* GLOB_ABORTED? Only happens with GLOB_ERR flag,
3265 * but we didn't specify it. Paranoia again. */ 3265 * but we didn't specify it. Paranoia again. */
3266 bb_error_msg_and_die("glob error %d on '%s'", gr, pattern); 3266 bb_error_msg_and_die("glob error %d on '%s'", gr, pattern);