diff options
| author | Andi Gutmans <andi@php.net> | 2000-08-22 17:59:35 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2000-08-22 17:59:35 +0000 |
| commit | 0222b7ab416d845abcd3925b3da47fa2d7ed238d (patch) | |
| tree | 38cbb73fda38196612fddffda4d803003a86b568 /ext/mysql/libmysql/string.c | |
| parent | 60676f19a5f5425c4375d8ba60e8bd07016ba562 (diff) | |
| download | php-git-0222b7ab416d845abcd3925b3da47fa2d7ed238d.tar.gz | |
- Try and revert libmysql for 4.0.2
Diffstat (limited to 'ext/mysql/libmysql/string.c')
| -rw-r--r-- | ext/mysql/libmysql/string.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/ext/mysql/libmysql/string.c b/ext/mysql/libmysql/string.c index 0696c72b92..a14cc138fa 100644 --- a/ext/mysql/libmysql/string.c +++ b/ext/mysql/libmysql/string.c @@ -1,19 +1,5 @@ -/* 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, - 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 */ +/* Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB + This file is public domain and comes with NO WARRANTY of any kind */ /* Code for handling strings with can grow dynamicly. @@ -33,7 +19,7 @@ my_bool init_dynamic_string(DYNAMIC_STRING *str, const char *init_str, if (!alloc_increment) alloc_increment=128; length=1; - if (init_str && (length= (uint) strlen(init_str)+1) < init_alloc) + if (init_str && (length=strlen(init_str)+1) < init_alloc) init_alloc=((length+alloc_increment-1)/alloc_increment)*alloc_increment; if (!init_alloc) init_alloc=alloc_increment; @@ -53,7 +39,7 @@ my_bool dynstr_set(DYNAMIC_STRING *str, const char *init_str) uint length; DBUG_ENTER("dynstr_set"); - if (init_str && (length= (uint) strlen(init_str)+1) > str->max_length) + if (init_str && (length=strlen(init_str)+1) > str->max_length) { str->max_length=((length+str->alloc_increment-1)/str->alloc_increment)* str->alloc_increment; |