[srm-cvs] CVS Update: - Fix build by getting rid of srm_free and fixing the Makefile.in to exclude

Date: Sun Jan 26 17:34:11 CET 2003
User: Derick Rethans
Directory: srm/main/src

Log Message:
 [0.25]
 - Fix build by getting rid of srm_free and fixing the Makefile.in to exclude
   error.c and include srm_error.c
 
Modified files:
           srm/main/srm_config.h.in (version: 1.28)
           srm/main/src/Makefile.am (version: 1.31)
           srm/main/src/srm_storage.c (version: 1.33)

[FILE: /srm/main/srm_config.h.in]

--- srm/main/srm_config.h.in:1.27 Sat Jan 18 15:11:28 2003 GMT
+++ srm/main/srm_config.h.in Sun Jan 26 15:34:09 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.27 2003/01/18 16:11:28 derick Exp $ */
+/* $Id: cvstemp,v 1.28 2003/01/26 16:34:09 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
@@ -26,12 +26,6 @@
 
 #ifdef HAVE_DMALLOC
 #include <dmalloc.h>
-#endif
-
-#if defined(SRM_DEBUG) && !defined(HAVE_DMALLOC)
-#define free(x) srm_free(x)
-
-void srm_free (void *ptr);
 #endif
 
 /* Version */

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

--- srm/main/src/Makefile.am:1.30 Sun Feb 10 18:54:26 2002 GMT
+++ srm/main/src/Makefile.am Sun Jan 26 15:34:11 2003 GMT
@@ -1,5 +1,5 @@
 ##
-## $Id: cvstemp,v 1.30 2002/02/10 19:54:26 sterling Exp $
+## $Id: cvstemp,v 1.31 2003/01/26 16:34:11 derick Exp $
 ##
 
 ## The contents of this file are subject to the Vulcan Logic Public
@@ -24,9 +24,9 @@
 lib_LTLIBRARIES = libsrm_client.la
 noinst_LIBRARIES = libsrm.a
 
-libsrm_client_la_SOURCES = srm_client.c connect.c storage.c connection.c functions.c error.c srm_hash.c srm_llist.c srm_value.c srm_compat.c srm_storage.c srm_queue.c
+libsrm_client_la_SOURCES = srm_client.c connect.c storage.c connection.c functions.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 error.c ini_parser.c srm_modules.c functions.c srm_hash.c srm_llist.c srm_value.c srm_compat.c srm_storage.c srm_ini_parser.y srm_ini_scanner.l
+libsrm_a_SOURCES = connection.c srm_error.c ini_parser.c srm_modules.c functions.c srm_hash.c srm_llist.c srm_value.c srm_compat.c srm_storage.c srm_ini_parser.y srm_ini_scanner.l
 
 noinst_HEADERS = connection.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

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

--- srm/main/src/srm_storage.c:1.32 Sun Aug 25 10:04:32 2002 GMT
+++ srm/main/src/srm_storage.c Sun Jan 26 15:34:11 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.32 2002/08/25 12:04:32 derick Exp $ */
+/* $Id: cvstemp,v 1.33 2003/01/26 16:34:11 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
@@ -61,7 +61,7 @@
                                 deserialize (data, finfo.st_size, (struct srm_value**) &sval_temp, 0);
 
                                 hash_temp = sval_temp->hash;
- /* Invalidate hash, so that srm_free_value can be called */
+ /* Invalidate hash, so that srm_value_free can be called */
                                 sval_temp->hash = NULL;
                                 VALP_SET_NULL(sval_temp);
                                 srm_value_free (sval_temp);
Received on Sun Jan 26 17:32:35 2003