← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/ip/IpAddress.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/ip/IpAddress.h
238
238
     \param force (optional) require the IPA in a specific format.
239
239
     \return pointer to buffer received.
240
240
     */
241
 
    char* NtoA(char *buf, unsigned int len, int force = AF_UNSPEC) const;
 
241
    char* NtoA(char *buf, const unsigned int blen, int force = AF_UNSPEC) const;
242
242
 
243
243
    /** Return the ASCII equivalent of the address:port combination
244
244
     *  Provides a URL formatted version of the content.
256
256
     *  eg. 127.0.0.1 (IPv4) or [::1] (IPv6)
257
257
     \param buf Allocated buffer to write address to
258
258
     \param len byte length of buffer available for writing.
259
 
     \return pointer to buffer received.
 
259
     \return amount of buffer filled.
260
260
     */
261
261
    unsigned int ToHostname(char *buf, const unsigned int len) const;
262
262