diff options
author | monty@hundin.mysql.fi <> | 2001-12-06 14:10:51 +0200 |
---|---|---|
committer | monty@hundin.mysql.fi <> | 2001-12-06 14:10:51 +0200 |
commit | b658662ae4da6a9cfc83ed52d1cb9b84fcfa98ae (patch) | |
tree | 5892a4c0af05e8a0354e957498fe09243b13eebc /readline | |
parent | b4da2fb0ab60caad614ed5ba3705367d7004ab22 (diff) | |
download | mariadb-git-b658662ae4da6a9cfc83ed52d1cb9b84fcfa98ae.tar.gz |
Update copyright
Fixed memory leak on shutdown (Affects the embedded version & MyODBC)
Diffstat (limited to 'readline')
-rw-r--r-- | readline/bind.c | 10 | ||||
-rw-r--r-- | readline/complete.c | 4 | ||||
-rw-r--r-- | readline/display.c | 4 | ||||
-rw-r--r-- | readline/funmap.c | 2 | ||||
-rw-r--r-- | readline/histexpand.c | 10 | ||||
-rw-r--r-- | readline/histfile.c | 2 | ||||
-rw-r--r-- | readline/history.c | 2 | ||||
-rw-r--r-- | readline/history.h | 2 | ||||
-rw-r--r-- | readline/input.c | 2 | ||||
-rw-r--r-- | readline/kill.c | 4 | ||||
-rw-r--r-- | readline/readline.c | 6 | ||||
-rw-r--r-- | readline/readline.h | 8 | ||||
-rw-r--r-- | readline/vi_mode.c | 6 |
13 files changed, 31 insertions, 31 deletions
diff --git a/readline/bind.c b/readline/bind.c index 57e53c03a20..f122bdf4860 100644 --- a/readline/bind.c +++ b/readline/bind.c @@ -733,7 +733,7 @@ _rl_read_init_file (const char *filename, int include_level) if (buffer == 0) return (errno); - + if (include_level == 0 && filename != last_readline_init_file) { FREE (last_readline_init_file); @@ -935,7 +935,7 @@ parser_include (args) return r; } - + /* Associate textual names with actual functions. */ static struct { const char *name; @@ -1370,7 +1370,7 @@ rl_variable_bind (name, value) _rl_isearch_terminators[end] = '\0'; free (v); } - + /* For the time being, unknown variable names are simply ignored. */ return 0; } @@ -1451,7 +1451,7 @@ rl_get_keymap_name (map) return (keymap_names[i].name); return ((char *)NULL); } - + void rl_set_keymap (map) Keymap map; @@ -1670,7 +1670,7 @@ rl_invoking_keyseqs_in_map (function, map) keyname[0] = (char) key; keyname[1] = '\0'; } - + strcat (keyname, seqs[i]); free (seqs[i]); diff --git a/readline/complete.c b/readline/complete.c index c4e33fc3f83..8810ca06d5f 100644 --- a/readline/complete.c +++ b/readline/complete.c @@ -241,7 +241,7 @@ Function *rl_ignore_some_completions_function = (Function *)NULL; and a pointer to the quoting character to be used, which the function can reset if desired. */ CPFunction *rl_filename_quoting_function = rl_quote_filename; - + /* Function to call to remove quoting characters from a filename. Called before completion is attempted, so the embedded quotes do not interfere with matching names in the file system. Readline doesn't do anything @@ -1010,7 +1010,7 @@ display_matches (matches) (*rl_completion_display_matches_hook) (matches, len, max); return; } - + /* If there are many items, then ask the user if she really wants to see them all. */ if (len >= rl_completion_query_items) diff --git a/readline/display.c b/readline/display.c index 004967c5dc5..e21af1f472d 100644 --- a/readline/display.c +++ b/readline/display.c @@ -218,7 +218,7 @@ expand_prompt (pmt, lp, lip) l = strlen (pmt); r = ret = xmalloc (l + 1); - + for (rl = ignoring = last = 0, p = pmt; p && *p; p++) { /* This code strips the invisible character string markers @@ -831,7 +831,7 @@ update_line (old, new, current_line, omax, nmax, inv_botlin) if (old[0] && new[0]) old[0] = new[0]; } - + /* Find first difference. */ for (ofd = old, nfd = new; (ofd - old < omax) && *ofd && (*ofd == *nfd); diff --git a/readline/funmap.c b/readline/funmap.c index 371a9e022c9..472119bd80a 100644 --- a/readline/funmap.c +++ b/readline/funmap.c @@ -187,7 +187,7 @@ rl_add_funmap_entry (const char *name, Function *function) funmap_size += 64; funmap = (FUNMAP **)xrealloc (funmap, funmap_size * sizeof (FUNMAP *)); } - + funmap[funmap_entry] = (FUNMAP *)xmalloc (sizeof (FUNMAP)); funmap[funmap_entry]->name = name; funmap[funmap_entry]->function = function; diff --git a/readline/histexpand.c b/readline/histexpand.c index ce90aced3be..f78838ef2ba 100644 --- a/readline/histexpand.c +++ b/readline/histexpand.c @@ -249,7 +249,7 @@ get_history_event (string, caller_index, delimiting_quote) { entry = current_history (); history_offset = history_length; - + /* If this was a substring search, then remember the string that we matched for word substitution. */ if (substring_okay) @@ -515,7 +515,7 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line) quoted_search_delimiter = string[i - 1]; event = get_history_event (string, &i, quoted_search_delimiter); } - + if (event == 0) { *ret_string = hist_error (string, start, i, EVENT_NOT_FOUND); @@ -826,7 +826,7 @@ history_expand (hstring, output) *output = savestring (hstring); return (0); } - + /* Prepare the buffer for printing error messages. */ result = xmalloc (result_len = 256); result[0] = '\0'; @@ -905,7 +905,7 @@ history_expand (hstring, output) i++; } } - + if (string[i] != history_expansion_char) { free (result); @@ -1240,7 +1240,7 @@ history_tokenize_internal (string, wind, indp) return (result); start = i; - + if (member (string[i], "()\n")) { i++; diff --git a/readline/histfile.c b/readline/histfile.c index 40e42de52f8..1da45b00b58 100644 --- a/readline/histfile.c +++ b/readline/histfile.c @@ -92,7 +92,7 @@ history_filename (filename) if (return_val) return (return_val); - + home = get_env_value ("HOME"); if (home == 0) diff --git a/readline/history.c b/readline/history.c index d56ffacc6a0..804ffddcd89 100644 --- a/readline/history.c +++ b/readline/history.c @@ -161,7 +161,7 @@ history_set_pos (pos) history_offset = pos; return (1); } - + /* Return the current history array. The caller has to be carefull, since this is the actual array of data, and could be bashed or made corrupt easily. The array is terminated with a NULL pointer. */ diff --git a/readline/history.h b/readline/history.h index 9ae2ee01a7c..88bf471bb62 100644 --- a/readline/history.h +++ b/readline/history.h @@ -116,7 +116,7 @@ extern HIST_ENTRY **history_list __P((void)); /* Returns the number which says what history element we are now looking at. */ extern int where_history __P((void)); - + /* Return the history entry at the current position, as determined by history_offset. If there is no entry there, return a NULL pointer. */ HIST_ENTRY *current_history __P((void)); diff --git a/readline/input.c b/readline/input.c index e23af552494..ea1342969b0 100644 --- a/readline/input.c +++ b/readline/input.c @@ -311,7 +311,7 @@ _rl_input_available () void _rl_insert_typein (c) int c; -{ +{ int key, t, i; char *string; diff --git a/readline/kill.c b/readline/kill.c index 328c85c2270..78387e138c2 100644 --- a/readline/kill.c +++ b/readline/kill.c @@ -440,7 +440,7 @@ rl_copy_backward_word (count, key) return (_rl_copy_word_as_kill (count, -1)); } - + /* Yank back the last killed text. This ignores arguments. */ int rl_yank (int count __attribute__((unused)), @@ -590,7 +590,7 @@ rl_yank_last_arg (count, key) if (history_skip < 0) history_skip = 0; } - + if (explicit_arg_p) retval = rl_yank_nth_arg_internal (count_passed, key, history_skip); else diff --git a/readline/readline.c b/readline/readline.c index 8cb7885eef7..1da73250773 100644 --- a/readline/readline.c +++ b/readline/readline.c @@ -280,7 +280,7 @@ int _rl_mark_modified_lines = 0; /* The style of `bell' notification preferred. This can be set to NO_BELL, AUDIBLE_BELL, or VISIBLE_BELL. */ int _rl_bell_preference = AUDIBLE_BELL; - + /* String inserted into the line by rl_insert_comment (). */ char *_rl_comment_begin; @@ -755,7 +755,7 @@ readline_initialize_everything () /* Decide whether we should automatically go into eight-bit mode. */ _rl_init_eightbit (); - + /* Read in the init file. */ rl_read_init_file ((char *)NULL); @@ -1547,7 +1547,7 @@ rl_rubout_or_delete (count, key) return (rl_rubout (count, key)); else return (rl_delete (count, key)); -} +} /* Delete all spaces and tabs around point. */ int diff --git a/readline/readline.h b/readline/readline.h index 49442bf163f..7804d31efb1 100644 --- a/readline/readline.h +++ b/readline/readline.h @@ -291,7 +291,7 @@ extern Function *rl_function_of_keyseq __P((const char *, Keymap, int *)); extern void rl_list_funmap_names __P((void)); extern char **rl_invoking_keyseqs_in_map __P((Function *, Keymap)); extern char **rl_invoking_keyseqs __P((Function *)); - + extern void rl_function_dumper __P((int)); extern void rl_macro_dumper __P((int)); extern void rl_variable_dumper __P((int)); @@ -380,7 +380,7 @@ extern int rl_clear_signals __P((void)); extern void rl_cleanup_after_signal __P((void)); extern void rl_reset_after_signal __P((void)); extern void rl_free_line_state __P((void)); - + /* Undocumented. */ extern int rl_expand_prompt __P((char *)); @@ -448,7 +448,7 @@ extern Function *rl_startup_hook; readline_internal_setup () returns and readline_internal starts reading input characters. */ extern Function *rl_pre_input_hook; - + /* The address of a function to call periodically while Readline is awaiting character input, or NULL, for no event handling. */ extern Function *rl_event_hook; @@ -599,7 +599,7 @@ extern int rl_ignore_completion_duplicates; /* If this is non-zero, completion is (temporarily) inhibited, and the completion character will be inserted as any other. */ extern int rl_inhibit_completion; - + /* Definitions available for use by readline clients. */ #define RL_PROMPT_START_IGNORE '\001' #define RL_PROMPT_END_IGNORE '\002' diff --git a/readline/vi_mode.c b/readline/vi_mode.c index 4c65400e12f..5f97ef2a4c4 100644 --- a/readline/vi_mode.c +++ b/readline/vi_mode.c @@ -215,7 +215,7 @@ rl_vi_undo (count, key) { return (rl_undo_command (count, key)); } - + /* Yank the nth arg from the previous line into this line at point. */ int rl_vi_yank_arg (count, key) @@ -633,7 +633,7 @@ _rl_vi_save_insert (up) strncpy (vi_insert_buffer, rl_line_buffer + start, len - 1); vi_insert_buffer[len-1] = '\0'; } - + void _rl_vi_done_inserting () { @@ -1006,7 +1006,7 @@ rl_vi_delete (count, key) end = rl_end; rl_kill_text (rl_point, end); - + if (rl_point > 0 && rl_point == rl_end) rl_backward (1, key); return (0); |