]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Author: Francesco Chemolli <kinkie@squid-cache.org>
authorAmos Jeffries <squid3@treenet.co.nz>
Wed, 18 Feb 2009 10:58:53 +0000 (23:58 +1300)
committerAmos Jeffries <squid3@treenet.co.nz>
Wed, 18 Feb 2009 10:58:53 +0000 (23:58 +1300)
String NG : basic SquidString updates pt 2

- finished the analysis of raw buffer exporting, divided among c-sting
and raw-buf access clients
- general sanitization
- reversal of some wrongly-renamed variables and comments
- implementation of SQUIDSTRINGPRINT and SQUIDSTRINGPH (placeholder) macros and
    psize() function for printf-style calls
- implementation of, and migration to, String::size_type and String::npos
- de-inlining of pos(), rpos(), find() and rfind() calls
- implementation and use of a proper substr() call

1  2 
src/Makefile.am
src/String.cci

diff --cc src/Makefile.am
Simple merge
diff --cc src/String.cci
index 11dbd62cf396487c1d41e473df660a302f6584d2,7f7c881e956d8c1ce0c7bcbf9903056ba02fbd10..66790f3d65d59a6e908cd299b3e05a31eb52e5c8
   */
  
  #include "config.h"
 -#include "assert.h"
  #include <cstring>
  
+ #ifdef HAVE_STDINT_H
+ #include <stdint.h> //for INT_MAX
+ #else /* HAVE_STDINT_H */
+ #ifndef INT_MAX
+ #define INT_MAX 1<<31 //hack but a safe bet
+ #endif /* INT_MAX */
+ #endif /* HAVE_STDINT_H */
  String::String() : size_(0), len_(0), buf_ (NULL)
  {
  #if DEBUGSTRINGS