diskd compile fixes

diff --git a/src/Makefile.in b/src/Makefile.in
index 04654ba8d708400fc0bf8cc63b0733d2e14939fb..25ec28f7834e28be712f251463fcb7ddfac0d797 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.177 1999/06/30 05:49:37 wessels Exp $
+#  $Id: Makefile.in,v 1.178 1999/06/30 06:28:58 wessels Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -225,7 +225,7 @@ $(DNSSERVER_EXE): dnsserver.o
        $(CC) -o $@ $(LDFLAGS) dnsserver.o $(DNSSERVER_LIBS)
 
 $(DISKD_EXE): diskd-daemon.o
-       $(CC) -o $@ $(LDFLAGS) diskd.o $(DISKD_LIBS)
+       $(CC) -o $@ $(LDFLAGS) diskd-daemon.o $(DISKD_LIBS)
 
 diskd-daemon.o: diskd.c
        $(CC) -c $(CFLAGS) -DDISKD_DAEMON=1 $(srcdir)/diskd.c -o $@

diff --git a/src/mime.cc b/src/mime.cc
index 42dca5f364a2faa0c22e3bd1a936fdc78786ae11..c256e2530690d26458e8318c6c8a17e91c64ea72 100644 (file)
--- a/src/mime.cc
+++ b/src/mime.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: mime.cc,v 1.90 1999/06/17 04:04:04 wessels Exp $
+ * $Id: mime.cc,v 1.91 1999/06/30 06:29:00 wessels Exp $
  *
  * DEBUG: section 25    MIME Parsing
  * AUTHOR: Harvest Derived
@@ -286,6 +286,7 @@ mimeInit(char *filename)
     regex_t re;
     mimeEntry *m;
     int re_flags = REG_EXTENDED | REG_NOSUB | REG_ICASE;
+return;
     if (filename == NULL)
        return;
     if ((fp = fopen(filename, "r")) == NULL) {

diff --git a/src/structs.h b/src/structs.h
index b07d30b36d370d6e69207aff9243378826c9b09e..3c12571ea6f19340da2bfd8c0556d99bef456450 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.302 1999/06/30 05:49:44 wessels Exp $
+ * $Id: structs.h,v 1.303 1999/06/30 06:29:02 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -1325,9 +1325,12 @@ struct _SwapDir {
            int smsgid;
            int rmsgid;
            int wfd;
-           int send_no;
-           int recv_no;
            int away;
+           struct {
+               char *buf;
+               link_list *stack;
+               int id;
+           } shm;
        } diskd;
 #endif
     } u;

diff --git a/src/tools.cc b/src/tools.cc
index 999d65c5b2c4b9e3592b406e7dc5b532b1c9248b..b09c64ed4af6ecc9a2ffd46d5d633ffad842f7a2 100644 (file)
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tools.cc,v 1.183 1999/06/24 20:20:21 wessels Exp $
+ * $Id: tools.cc,v 1.184 1999/06/30 06:29:03 wessels Exp $
  *
  * DEBUG: section 21    Misc Functions
  * AUTHOR: Harvest Derived
@@ -305,9 +305,9 @@ fatal_common(const char *message)
 #if HAVE_SYSLOG
     syslog(LOG_ALERT, "%s", message);
 #endif
-    fprintf(debug_log, "FATAL: %s\n", message);
+    fprintf(debug_log, "FATAL: pid %d %s\n", (int) getpid(), message);
     if (opt_debug_stderr && debug_log != stderr)
-       fprintf(stderr, "FATAL: %s\n", message);
+       fprintf(stderr, "FATAL: pid %d %s\n", (int) getpid(), message);
     fprintf(debug_log, "Squid Cache (Version %s): Terminated abnormally.\n",
        version_string);
     fflush(debug_log);

diff --git a/src/typedefs.h b/src/typedefs.h
index 8a49b43d8b5f3b3763a7a0fc55ae17b664857f4a..65a0d5c44f757be1628242e2c2c39e7e4acba8a1 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: typedefs.h,v 1.96 1999/06/25 23:37:35 wessels Exp $
+ * $Id: typedefs.h,v 1.97 1999/06/30 06:29:04 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -31,6 +31,9 @@
  *
  */
 
+#ifndef _TYPEDEFS_H_
+#define _TYPEDEFS_H_
+
 typedef unsigned int store_status_t;
 typedef unsigned int mem_status_t;
 typedef unsigned int ping_status_t;
@@ -264,3 +267,5 @@ typedef unsigned int delay_id;
 #if USE_HTCP
 typedef struct _htcpReplyData htcpReplyData;
 #endif
+
+#endif /* _TYPEDEFS_H_ */