← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/squid3/oneiric-security

« back to all changes in this revision

Viewing changes to src/SquidString.h

  • Committer: Bazaar Package Importer
  • Author(s): Mahyuddin Susanto
  • Date: 2011-02-15 18:46:13 UTC
  • mfrom: (21.2.4 sid)
  • Revision ID: james.westby@ubuntu.com-20110215184613-1u3dh5sz4i055flk
Tags: 3.1.10-1ubuntu1
https://launchpad.net/bugs/719283
* Merge from debian unstable. (LP: #719283)  Remaining changes:
  - debian/patches/18-fix-ftbfs-binutils-gold.dpatch: Add library linker into
    LIBS instead to LDFLAGS to fixing FTBFS binutils-gold.
* Drop Ubuntu configuration for ufw which landed in Debian and sync it: 
  - debian/squid3.ufw.profile.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/SquidString.h
44
44
/* squid string placeholder (for printf) */
45
45
#ifndef SQUIDSTRINGPH
46
46
#define SQUIDSTRINGPH "%.*s"
47
 
#define SQUIDSTRINGPRINT(s) s.psize(),s.rawBuf()
 
47
#define SQUIDSTRINGPRINT(s) (s).psize(),(s).rawBuf()
48
48
#endif /* SQUIDSTRINGPH */
49
49
 
50
50
 
167
167
    void allocBuffer(size_type sz);
168
168
    void setBuffer(char *buf, size_type sz);
169
169
 
 
170
    _SQUID_INLINE_ bool nilCmp(bool, bool, int &) const;
 
171
 
170
172
    /* never reference these directly! */
171
173
    size_type size_; /* buffer size; 64K limit */
172
174