Branch: Tag:

2002-10-20

2002-10-20 22:05:08 by Marcus Comstedt <marcus@mc.pp.se>

Renamed "string" typedef in dynamic_buffer.h to avoid unneccesary name clashes.

Rev: src/dynamic_buffer.c:1.22
Rev: src/dynamic_buffer.h:1.17
Rev: src/modules/Mysql/mysql.c:1.60
Rev: src/modules/Mysql/result.c:1.28
Rev: src/modules/sprintf/sprintf.c:1.98
Rev: src/svalue.c:1.148

2:   || This file is part of Pike. For copyright information see COPYRIGHT.   || Pike is distributed under GPL, LGPL and MPL. See the file COPYING   || for more information. - || $Id: dynamic_buffer.c,v 1.21 2002/10/11 01:39:30 nilsson Exp $ + || $Id: dynamic_buffer.c,v 1.22 2002/10/20 22:05:07 marcus Exp $   */      #include "global.h"
11:   #include "pike_error.h"   #include "pike_memory.h"    - RCSID("$Id: dynamic_buffer.c,v 1.21 2002/10/11 01:39:30 nilsson Exp $"); + RCSID("$Id: dynamic_buffer.c,v 1.22 2002/10/20 22:05:07 marcus Exp $");      static dynamic_buffer buff;   
77:    }   }    - PMOD_EXPORT void low_init_buf_with_string(string s, dynamic_buffer *buf) + PMOD_EXPORT void low_init_buf_with_string(dynbuf_string s, dynamic_buffer *buf)   {    if(buf->s.str) { free(buf->s.str); buf->s.str=NULL; }    buf->s=s;
92:   #endif   }    - PMOD_EXPORT string complex_free_buf(void) + PMOD_EXPORT dynbuf_string complex_free_buf(void)   { -  string tmp; +  dynbuf_string tmp;    if(!buff.s.str) return buff.s;    my_putchar(0);    buff.s.len--;
133:   PMOD_EXPORT void my_strcat(const char *b) { my_binary_strcat(b,strlen(b)); }   PMOD_EXPORT void initialize_global_buf(void) { buff.s.str = NULL; }   PMOD_EXPORT void init_buf(void) { low_reinit_buf(&buff); } - PMOD_EXPORT void init_buf_with_string(string s) { low_init_buf_with_string(s,&buff); } + PMOD_EXPORT void init_buf_with_string(dynbuf_string s) { low_init_buf_with_string(s,&buff); }   PMOD_EXPORT char *debug_return_buf(void)   {    my_putchar(0);    return buff.s.str;   }   /* int my_get_buf_size() { return buff->s.len; } */