Some C++ HEAD bug fixes

Hi,

Working on Windows port, I have found some C++ bugs. The following are the
fixes:

Index: src/asn.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/asn.cc,v
retrieving revision 1.4
diff -u -p -r1.4 asn.cc
--- src/asn.cc 25 Oct 2002 21:45:57 -0000 1.4
+++ src/asn.cc 2 Jan 2003 20:15:47 -0000
@@ -153,7 +153,7 @@ asnAclInitialize(acl * acls)

  /* initialize the radix tree structure */

-extern int squid_max_keylen; /* yuck.. this is in lib/radix.c */
+SQUIDCEXTERN int squid_max_keylen; /* yuck.. this is in lib/radix.c */

  CBDATA_TYPE(ASState);
  void
Index: src/snmp_core.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/snmp_core.cc,v
retrieving revision 1.4
diff -u -p -r1.4 snmp_core.cc
--- src/snmp_core.cc 18 Nov 2002 03:12:57 -0000 1.4
+++ src/snmp_core.cc 2 Jan 2003 20:15:48 -0000
@@ -62,7 +62,7 @@ static oid *snmpCreateOid(int length,...
  static mib_tree_entry *snmpAddNode();
  static oid *snmpCreateOid();
  #endif
-extern void (*snmplib_debug_hook) (int, char *);
+SQUIDCEXTERN void (*snmplib_debug_hook) (int, char *);
  static oid *static_Inst(oid * name, snint * len, mib_tree_entry *
current, oid_ParseFn ** Fn);
  static oid *time_Inst(oid * name, snint * len, mib_tree_entry * current,
oid_ParseFn ** Fn);
  static oid *peer_Inst(oid * name, snint * len, mib_tree_entry * current,
oid_ParseFn ** Fn);
Index: src/tools.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/tools.cc,v
retrieving revision 1.4
diff -u -p -r1.4 tools.cc
--- src/tools.cc 18 Nov 2002 03:12:57 -0000 1.4
+++ src/tools.cc 2 Jan 2003 20:15:49 -0000
@@ -60,7 +60,7 @@ SQUIDCEXTERN void backtrace_symbols_fd(v
  SQUIDCEXTERN int setresuid(uid_t, uid_t, uid_t);
  #endif /* _SQUID_LINUX */

-extern void (*failure_notify) (const char *);
+SQUIDCEXTERN void (*failure_notify) (const char *);

  MemPool *dlink_node_pool = NULL;

Index: src/fs/ufs/store_dir_ufs.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/fs/ufs/store_dir_ufs.cc,v
retrieving revision 1.2
diff -u -p -r1.2 store_dir_ufs.cc
--- src/fs/ufs/store_dir_ufs.cc 28 Dec 2002 03:12:35 -0000 1.2
+++ src/fs/ufs/store_dir_ufs.cc 2 Jan 2003 20:15:49 -0000
@@ -683,7 +683,7 @@ UFSSwapDir::closeTmpSwapLog()
      int fd;
      file_close(swaplog_fd);
  #if defined (_SQUID_OS2_) || defined (_SQUID_CYGWIN_) ||
defined(_SQUID_MSWIN_)
- if (unlink(swaplog_path) < 0) {
+ if (::unlink(swaplog_path) < 0) {
         debug(50, 0) ("%s: %s\n", swaplog_path, xstrerror());
         fatal("commonUfsDirCloseTmpSwapLog: unlink failed");
      }
@@ -892,7 +892,7 @@ UFSSwapDir::writeCleanDone()
  #if defined(_SQUID_OS2_) || defined (_SQUID_CYGWIN_) ||
defined(_SQUID_MSWIN_)
         file_close(state->fd);
         state->fd = -1;
- if (unlink(state->cur) < 0)
+ if (::unlink(state->cur) < 0)
             debug(50, 0) ("storeDirWriteCleanLogs: unlinkd failed: %s, %s\n",
                 xstrerror(), state->cur);
  #endif

Regards

Guido

-
=======================================================
Serassio Guido
Via Albenga, 11/4 10134 - Torino - ITALY
E-mail: guido.serassio@serassio.it
WWW: http://www.serassio.it
Received on Thu Jan 02 2003 - 13:19:57 MST