diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2011-12-06 22:00:44 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2011-12-06 22:00:44 +0200 |
| commit | 3ba2f61ff006c308a904c8b1a4bc433082ce87c8 (patch) | |
| tree | 634e529b16d2d8ea6b3655172f58d35e014edcb0 /array.c | |
| parent | 1527865d3c430aa203ed23fa7ecbeea30a604724 (diff) | |
| download | egawk-3ba2f61ff006c308a904c8b1a4bc433082ce87c8.tar.gz egawk-3ba2f61ff006c308a904c8b1a4bc433082ce87c8.tar.bz2 egawk-3ba2f61ff006c308a904c8b1a4bc433082ce87c8.zip | |
Misc fixes from John.
Diffstat (limited to 'array.c')
| -rw-r--r-- | array.c | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -1509,7 +1509,6 @@ sort_user_func(const void *p1, const void *p2) NODE *idx1, *idx2, *val1, *val2; AWKNUM ret; INSTRUCTION *code; - extern int exiting; t1 = *((const NODE *const *) p1); t2 = *((const NODE *const *) p2); @@ -1534,9 +1533,6 @@ sort_user_func(const void *p1, const void *p2) /* execute the comparison function */ (void) interpret(code); - if (exiting) /* do not assume anything about the user-defined function! */ - gawk_exit(exit_val); - /* return value of the comparison function */ POP_NUMBER(ret); @@ -1672,9 +1668,9 @@ assoc_list(NODE *array, const char *sort_str, SORT_CTXT sort_ctxt) (code + 1)->expr_count = 4; /* function takes 4 arguments */ code->nexti = bcalloc(Op_stop, 1, 0); - /* make non-local jumps `next' and `nextfile' fatal in + /* make non-redirected getline, exit, `next' and `nextfile' fatal in * callback function by setting currule in interpret() - * to undefined (0). `exit' is handled in sort_user_func. + * to undefined (0). */ (code + 1)->inrule = currule; /* save current rule */ |