[srm-cvs] CVS Update: - More housekeeping, it's getting tidy now

Date: Wed Feb 19 21:15:54 CET 2003
User: Derick Rethans
Directory: srm/main/src

Log Message:
 [0.25]
 - More housekeeping, it's getting tidy now
 
Deleted files:
           srm/main/src/connection.c (last version: 1.69)
           srm/main/src/connection.h (last version: 1.25)
Modified files:
           srm/main/main.c (version: 1.70)
           srm/main/src/Makefile.am (version: 1.35)
           srm/main/src/srm_protocol_standard.c (version: 1.70)
           srm/main/src/srm_protocol_standard.h (version: 1.26)
           srm/main/src/srm_protocols.c (version: 1.6)
           srm/main/src/srm_protocols.h (version: 1.5)

[FILE: /srm/main/main.c]

--- srm/main/main.c:1.69 Tue Feb 18 20:19:57 2003 GMT
+++ srm/main/main.c Wed Feb 19 19:15:52 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.69 2003/02/18 21:19:57 derick Exp $ */
+/* $Id: cvstemp,v 1.70 2003/02/19 20:15:52 derick Exp $ */
 
 /* The contents of this file are subject to the Vulcan Logic Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -37,11 +37,11 @@
 #include "config.h"
 #include "srm_compat.h"
 #include "srm_config.h"
-#include "connection.h"
 #include "functions.h"
 #include "ini_parser.h"
 #include "srm_modules.h"
 #include "srm_protocols.h"
+#include "srm_protocol_standard.h"
 #include "srm_storage.h"
 
 

[FILE: /srm/main/src/Makefile.am]

--- srm/main/src/Makefile.am:1.34 Tue Feb 18 20:19:58 2003 GMT
+++ srm/main/src/Makefile.am Wed Feb 19 19:15:54 2003 GMT
@@ -1,5 +1,5 @@
 ##
-## $Id: cvstemp,v 1.34 2003/02/18 21:19:58 derick Exp $
+## $Id: cvstemp,v 1.35 2003/02/19 20:15:54 derick Exp $
 ##
 
 ## The contents of this file are subject to the Vulcan Logic Public
@@ -27,9 +27,9 @@
 
 libsrm_client_la_SOURCES = srm_client.c storage.c srm_error.c srm_hash.c srm_llist.c srm_value.c srm_compat.c srm_storage.c srm_queue.c
 
-libsrm_a_SOURCES = connection.c srm_error.c srm_modules.c functions.c srm_hash.c srm_llist.c srm_value.c srm_compat.c srm_protocols.c srm_storage.c srm_ini_parser.y srm_ini_scanner.l
+libsrm_a_SOURCES = srm_protocol_standard.c srm_error.c srm_modules.c functions.c srm_hash.c srm_llist.c srm_value.c srm_compat.c srm_protocols.c srm_storage.c srm_ini_parser.y srm_ini_scanner.l
 
-noinst_HEADERS = connection.h srm_error.h ini_parser.h srm_modules.h srm_storage.h
+noinst_HEADERS = srm_protocol_standard.h srm_error.h ini_parser.h srm_modules.h srm_storage.h
 include_HEADERS = functions.h srm_hash.h srm_client.h srm_modules.h srm_value.h srm_compat.h srm_llist.h srm_queue.h
 
 libsrm_client_la_LDFLAGS = -version-info @SRM_VERSION_INFO@

[FILE: /srm/main/src/srm_protocol_standard.c]

--- srm/main/src/srm_protocol_standard.c:1.69 Tue Feb 18 20:19:59 2003 GMT
+++ srm/main/src/srm_protocol_standard.c Wed Feb 19 19:15:54 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.69 2003/02/18 21:19:59 derick Exp $ */
+/* $Id: cvstemp,v 1.70 2003/02/19 20:15:54 derick Exp $ */
 
 /* The contents of this file are subject to the Vulcan Logic Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "srm_client.h"
 #include "srm_config.h"
-#include "connection.h"
+#include "srm_protocol_standard.h"
 #include "srm_protocols.h"
 #include "srm_storage.h"
 

[FILE: /srm/main/src/srm_protocol_standard.h]

--- srm/main/src/srm_protocol_standard.h:1.25 Tue Feb 18 20:19:59 2003 GMT
+++ srm/main/src/srm_protocol_standard.h Wed Feb 19 19:15:54 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.25 2003/02/18 21:19:59 derick Exp $ */
+/* $Id: cvstemp,v 1.26 2003/02/19 20:15:54 derick Exp $ */
 
 /* The contents of this file are subject to the Vulcan Logic Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -25,11 +25,6 @@
 
 #include "srm_com.h"
 #include <sys/types.h>
-
-typedef struct con_def {
- sess_key_t* session_key;
-} con_def;
-
 
 int srm_process_data (int fd);
 

[FILE: /srm/main/src/srm_protocols.c]

--- srm/main/src/srm_protocols.c:1.5 Tue Feb 18 20:19:59 2003 GMT
+++ srm/main/src/srm_protocols.c Wed Feb 19 19:15:54 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.5 2003/02/18 21:19:59 derick Exp $ */
+/* $Id: cvstemp,v 1.6 2003/02/19 20:15:54 derick Exp $ */
 
 /* The contents of this file are subject to the Vulcan Logic Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <sys/stat.h>
 
-#include "connection.h"
+#include "srm_com.h"
 #include "srm_protocols.h"
 
 #define SRM_MAX_PROTOCOLS 32

[FILE: /srm/main/src/srm_protocols.h]

--- srm/main/src/srm_protocols.h:1.4 Tue Feb 18 20:19:59 2003 GMT
+++ srm/main/src/srm_protocols.h Wed Feb 19 19:15:54 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.4 2003/02/18 21:19:59 derick Exp $ */
+/* $Id: cvstemp,v 1.5 2003/02/19 20:15:54 derick Exp $ */
 
 /* The contents of this file are subject to the Vulcan Logic Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -24,7 +24,6 @@
 #define __PROTOCOLS_H__
 
 #include "srm_value.h"
-#include "connection.h"
 
 #define CP connection_pool
 
@@ -51,6 +50,10 @@
         close (fd)
 
 extern struct con_pool connection_pool;
+
+typedef struct con_def {
+ sess_key_t* session_key;
+} con_def;
 
 typedef int (*prot_init_t)(int sock);
 typedef int (*prot_deinit_t)(int sock);
Received on Wed Feb 19 21:15:58 2003