Changeset 170 for trunk/src/sh_database.c

Timestamp:

Apr 30, 2008, 11:56:45 PM (16 years ago)

Author:

katerina

Message:

Plenty of compiler warnings fixed, SQL query length fixed, doc update.

File:

• trunk/src/sh_database.c (modified) (9 diffs)

trunk/src/sh_database.c

@@ -61 +61 @@
   char            msg[1024];
   char            sev[8];
-  char            path[12288];
+  char            path[MAX_PATH_STORE+1];
   char            user[9];
   char            group[9];
@@ -82 +82 @@
   char            interface[64];   
   char            ltime[64];   
-  char            dir[1024];   
-  char            linked_path[1024]; 
+  char            dir[MAX_PATH_STORE+1];   
+  char            linked_path[MAX_PATH_STORE+1]; 
   char            service[64];   
   char            facility[32];   
@@ -107 +107 @@
   char            chksum_old[50];
   char            chksum_new[50];
-  char            link_old[1024];
-  char            link_new[1024];
+  char            link_old[MAX_PATH_STORE+1];
+  char            link_new[MAX_PATH_STORE+1];
   char            acl_old[1024];
   char            acl_new[1024];
@@ -134 +134 @@
   { NULL, N_("msg"),         0,   4, 1024, 0, offsetof(struct dbins_, msg) },
 
-  { NULL, N_("path"),        0,   5,12288, 0, offsetof(struct dbins_, path)  },
+  { NULL, N_("path"),        0,   5,MAX_PATH_STORE+1, 0, offsetof(struct dbins_, path)  },
   /* username -> userid; replace (long) 'userid' - below - by 'dummy' */ 
   { NULL, N_("userid"),      0,   6,    9, 0, offsetof(struct dbins_, user)  },
@@ -155 +155 @@
   { NULL, N_("interface"),   0,  24,   64, 0, offsetof(struct dbins_, interface)},
   { NULL, N_("time"),        0,  25,   64, 0, offsetof(struct dbins_, ltime)  },
-  { NULL, N_("dir"),         0,  26, 1024, 0, offsetof(struct dbins_, dir)  },
-  { NULL, N_("linked_path"), 0,  27, 1024, 0, offsetof(struct dbins_, linked_path)},
+  { NULL, N_("dir"),         0,  26, MAX_PATH_STORE+1, 0, offsetof(struct dbins_, dir)  },
+  { NULL, N_("linked_path"), 0,  27, MAX_PATH_STORE+1, 0, offsetof(struct dbins_, linked_path)},
   { NULL, N_("service"),     0,  29,   64, 0, offsetof(struct dbins_, service)},
   { NULL, N_("facility"),    0,  30,   32, 0, offsetof(struct dbins_, facility) },
@@ -178 +178 @@
   { NULL, N_("chksum_old"),  0,  47,   50, 0, offsetof(struct dbins_, chksum_old)},
   { NULL, N_("chksum_new"),  0,  48,   50, 0, offsetof(struct dbins_, chksum_new)},
-  { NULL, N_("link_old"),    0,  49, 1024, 0, offsetof(struct dbins_, link_old)},
-  { NULL, N_("link_new"),    0,  50, 1024, 0, offsetof(struct dbins_, link_new)},
+  { NULL, N_("link_old"),    0,  49, MAX_PATH_STORE+1, 0, offsetof(struct dbins_, link_old)},
+  { NULL, N_("link_new"),    0,  50, MAX_PATH_STORE+1, 0, offsetof(struct dbins_, link_new)},
                                             
   { NULL, N_("size_old"),     0,  51,    0, 0, 0  },
@@ -1034 +1034 @@
 static int        connection_status = S_FALSE;
 
-void sh_database_reset()
+void sh_database_reset(void)
 {
   connection_status = S_FALSE;
@@ -1226 +1226 @@
 }
 
-#define SH_QUERY_MAX 16383
+#define SH_QUERY_MAX SH_MSG_BUF
+/* define SH_QUERY_MAX 16383 */
 
 static
@@ -1450 +1451 @@
 static int sh_database_comp_attr (const void *m1, const void *m2) 
 {
-  my_attr *mi1 = (my_attr *) m1;
-  my_attr *mi2 = (my_attr *) m2;
+  const my_attr *mi1 = (const my_attr *) m1;
+  const my_attr *mi2 = (const my_attr *) m2;
   return strcmp(mi1->attr, mi2->attr);
 }
 
 
-static void init_attr_table()
+static void init_attr_table(void)
 {
   static  int first = S_TRUE;