diff options
Diffstat (limited to 'client/readline.cc')
| -rw-r--r-- | client/readline.cc | 50 |
1 files changed, 20 insertions, 30 deletions
diff --git a/client/readline.cc b/client/readline.cc index f0312b089e5..f5fbfd8cd0c 100644 --- a/client/readline.cc +++ b/client/readline.cc @@ -1,23 +1,22 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, +/* Copyright (C) 2000 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* readline for batch mode */ -#include <global.h> +#include <my_global.h> #include <my_sys.h> #include <m_string.h> #include "my_readline.h" @@ -120,20 +119,11 @@ static bool init_line_buffer_from_string(LINE_BUFFER *buffer,my_string str) } -static void free_line_buffer(LINE_BUFFER *buffer) -{ - if (buffer->buffer) - { - my_free((gptr) buffer->buffer,MYF(0)); - buffer->buffer=0; - } -} - - -/* Fill the buffer retaining the last n bytes at the beginning of the - newly filled buffer (for backward context). Returns the number of new - bytes read from disk. */ - +/* + Fill the buffer retaining the last n bytes at the beginning of the + newly filled buffer (for backward context). Returns the number of new + bytes read from disk. +*/ static uint fill_buffer(LINE_BUFFER *buffer) { |