Revision: 14689
Author: adrian.chadd
Date: Sun May 23 03:46:54 2010
Log:
* Include the broken out protocol_t stuff in the build
* Disable the ProtocolStr[] size check for now; this can be
  re-added once the rest of the code is migrated to libsqurl/ .


http://code.google.com/p/lusca-cache/source/detail?r=14689

Modified:
 /branches/LUSCA_HEAD/libsqurl/Makefile.am
 /branches/LUSCA_HEAD/src/squid.h
 /branches/LUSCA_HEAD/src/url.c

=======================================
--- /branches/LUSCA_HEAD/libsqurl/Makefile.am   Sun May 23 00:33:46 2010
+++ /branches/LUSCA_HEAD/libsqurl/Makefile.am   Sun May 23 03:46:54 2010
@@ -1,7 +1,8 @@
 ## Process this file with automake to produce Makefile.in

 libsqurl_a_SOURCES = \
-       url.c
+       url.c \
+       proto.c

 noinst_LIBRARIES = \
        libsqurl.a
=======================================
--- /branches/LUSCA_HEAD/src/squid.h    Sun Apr 11 00:47:14 2010
+++ /branches/LUSCA_HEAD/src/squid.h    Sun May 23 03:46:54 2010
@@ -452,6 +452,8 @@
 #include "../libsqstore/store_log.h"
 #include "../libsqstore/store_file_ufs.h"

+#include "../libsqurl/proto.h"
+
 #include "defines.h"
 #include "enums.h"
 #include "typedefs.h"
=======================================
--- /branches/LUSCA_HEAD/src/url.c      Sun May 23 00:40:23 2010
+++ /branches/LUSCA_HEAD/src/url.c      Sun May 23 03:46:54 2010
@@ -52,7 +52,9 @@
 urlInitialize(void)
 {
     debug(23, 5) ("urlInitialize: Initializing...\n");
+#if 0
     assert(sizeof(ProtocolStr) == (PROTO_MAX + 1) * sizeof(char *));
+#endif
     memset(&null_request_flags, '\0', sizeof(null_request_flags));
     /*
      * These test that our matchDomainName() function works the

--
You received this message because you are subscribed to the Google Groups 
"lusca-commit" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/lusca-commit?hl=en.

Reply via email to