gnue/geas/src datamonitor/datamonitor.h objectc...

[Neil Tiffin]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Neil Tiffin <address@hidden>    01/06/10 06:12:35

Modified files:
        geas/src/datamonitor: datamonitor.h 
        geas/src/objectcache: objectcache.h objectcache_internal.h 
        geas/src/objectstore: objectstore.c 

Log message:
        Clean up a few more headers (GNU Format) for release.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/datamonitor/datamonitor.h.diff?cvsroot=OldCVS&tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/objectcache/objectcache.h.diff?cvsroot=OldCVS&tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/objectcache/objectcache_internal.h.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/objectstore/objectstore.c.diff?cvsroot=OldCVS&tr1=1.65&tr2=1.66&r1=text&r2=text

Patches:
Index: gnue/geas/src/datamonitor/datamonitor.h
diff -u gnue/geas/src/datamonitor/datamonitor.h:1.9 
gnue/geas/src/datamonitor/datamonitor.h:1.10
--- gnue/geas/src/datamonitor/datamonitor.h:1.9 Wed Jun  6 13:23:24 2001
+++ gnue/geas/src/datamonitor/datamonitor.h     Sun Jun 10 06:12:35 2001
@@ -1,5 +1,5 @@
 /*
-   Database communication monitoring
+   datamonitor.h - Database communication monitoring
 
    Copyright (C) 2001 Free Software Foundation
 
@@ -19,7 +19,7 @@
    along with GEAS; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   $Id: datamonitor.h,v 1.9 2001/06/06 20:23:24 reinhard Exp $
+   $Id: datamonitor.h,v 1.10 2001/06/10 13:12:35 ntiffin Exp $
 */
 
 #ifndef _DATAMONITOR_H
Index: gnue/geas/src/objectcache/objectcache.h
diff -u gnue/geas/src/objectcache/objectcache.h:1.16 
gnue/geas/src/objectcache/objectcache.h:1.17
--- gnue/geas/src/objectcache/objectcache.h:1.16        Fri Jun  8 23:25:26 2001
+++ gnue/geas/src/objectcache/objectcache.h     Sun Jun 10 06:12:35 2001
@@ -1,6 +1,8 @@
 
 /*
-   geas - GNU Enterprise Application Server
+   objectcache.h
+   
+   Part of GNU Enterprise Application Server (GEAS)
  
    Copyright (C) 2001 Free Software Foundation
  
@@ -17,6 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
+   
+   $Id: objectcache.h,v 1.17 2001/06/10 13:12:35 ntiffin Exp $
  
 */
 
@@ -33,49 +37,50 @@
 /* object flags */
 enum object_flag
 {
-   of_indatabase,      /* true if all fields are stored in database */
-   of_deleted         /* true if deleted but database not updated  */
+  of_indatabase,                /* true if all fields are stored in database */
+  of_deleted                    /* true if deleted but database not updated  */
 };
 #define FLAG_ON  TRUE
 #define FLAG_OFF FALSE
 
 
 /* allocate/free cache */
-void create_object_cache(guint32 max_lenght);
-void free_object_cache(void);
+void create_object_cache (guint32 max_lenght);
+void free_object_cache (void);
 
-void oc_shrink_cache( unsigned int new_max_length );
-void oc_extend_cache( unsigned int new_max_length );
+void oc_shrink_cache (unsigned int new_max_length);
+void oc_extend_cache (unsigned int new_max_length);
 
 /* Searching */
-ObjectData *oc_find_object_by_key( const char *classname, const char *key );
-ObjectData *oc_find_cached_object_by_key(const char *classname, const char 
*key);
+ObjectData *oc_find_object_by_key (const char *classname, const char *key);
+ObjectData *oc_find_cached_object_by_key (const char *classname,
+                                          const char *key);
 
 /* Object management */
-void oc_empty_cache( void );
-ObjectData *oc_add_empty_object  ( const char *classname, const char *key );
-gboolean    oc_remove_object     ( ObjectData *object );
-gboolean    oc_delete_object     ( const char *classname , const char *keystr 
);
+void oc_empty_cache (void);
+ObjectData *oc_add_empty_object (const char *classname, const char *key);
+gboolean oc_remove_object (ObjectData * object);
+gboolean oc_delete_object (const char *classname, const char *keystr);
 
-const char *oc_get_object_class(ObjectData * object);
-const char *oc_get_object_key  (ObjectData * object);
+const char *oc_get_object_class (ObjectData * object);
+const char *oc_get_object_key (ObjectData * object);
 
-gboolean oc_validate_object( const char *classname , const char *keystr );
+gboolean oc_validate_object (const char *classname, const char *keystr);
 
-void oc_flush_object_to_store( ObjectData *obj );
+void oc_flush_object_to_store (ObjectData * obj);
 
 /* Object flags */
-void oc_set_object_flag(ObjectData * object, enum object_flag flag,
-                     gboolean state);
-gboolean oc_get_object_flag(ObjectData * object, enum object_flag flag);
+void oc_set_object_flag (ObjectData * object, enum object_flag flag,
+                         gboolean state);
+gboolean oc_get_object_flag (ObjectData * object, enum object_flag flag);
 
 
 /* Data access */
-char     *oc_get_object_field(ObjectData *object , const char *fieldname);
-gboolean  oc_set_object_field(ObjectData *object , const char *fieldname,
-                             const char *value,gboolean readonly);
+char *oc_get_object_field (ObjectData * object, const char *fieldname);
+gboolean oc_set_object_field (ObjectData * object, const char *fieldname,
+                              const char *value, gboolean readonly);
 
-ObjectData *oc_search_for_single_object( _QueryData *q );
-GList      *oc_search_for_objects( _QueryData *q );
+ObjectData *oc_search_for_single_object (_QueryData * q);
+GList *oc_search_for_objects (_QueryData * q);
 
 #endif
Index: gnue/geas/src/objectcache/objectcache_internal.h
diff -u gnue/geas/src/objectcache/objectcache_internal.h:1.3 
gnue/geas/src/objectcache/objectcache_internal.h:1.4
--- gnue/geas/src/objectcache/objectcache_internal.h:1.3        Tue Feb 27 
15:49:14 2001
+++ gnue/geas/src/objectcache/objectcache_internal.h    Sun Jun 10 06:12:35 2001
@@ -1,6 +1,8 @@
 
 /*
-   geas - GNU Enterprise Application Server
+   objectcache_internal.h
+   
+   Part of GNU Enterprise Application Server (GEAS)
  
    Copyright (C) 2001 Free Software Foundation
  
@@ -17,6 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
+   
+   $Id: objectcache_internal.h,v 1.4 2001/06/10 13:12:35 ntiffin Exp $
  
 */
 
@@ -28,30 +32,32 @@
  */
 typedef struct _ObjectData
 {
-   /* object identifier */
-   char *classname,*key; /* classname/objectid */
-   char *hashkey; /* key used in hash table */
-
-   /* field data */
-   GHashTable *fields;
-
-   /* object flags */
-   int deleted : 1;
-   int indatabase : 1;
-
-   /* what indexes know about this object */
-   GList *indexes;
-} _ObjectData;
+  /* object identifier */
+  char *classname, *key;        /* classname/objectid */
+  char *hashkey;                /* key used in hash table */
+
+  /* field data */
+  GHashTable *fields;
+
+  /* object flags */
+  int deleted:1;
+  int indatabase:1;
+
+  /* what indexes know about this object */
+  GList *indexes;
+}
+_ObjectData;
 
 /**
  * This structure stores the value of a single field in an object
  */
 typedef struct _FieldData
 {
-   char     *name;
-   char     *value;
-   gboolean  readonly;
-} _FieldData;
+  char *name;
+  char *value;
+  gboolean readonly;
+}
+_FieldData;
 
 /**
  * This is stored in the hash table of an index.
@@ -65,30 +71,33 @@
  */
 typedef struct _CacheIndexLink
 {
-   char *hashkey;
-   GList *objects;
-} _CacheIndexLink;
+  char *hashkey;
+  GList *objects;
+}
+_CacheIndexLink;
 
 /**
  * This structure stores a hash table for a single index.
  */
 typedef struct _CacheIndex
 {
-   /* identify the index */
-   char *hashkey;
+  /* identify the index */
+  char *hashkey;
 
-   /* what fields are in this index */
-   _odl_index *index;
+  /* what fields are in this index */
+  _odl_index *index;
 
-   /* record the objects in this index */
-   GHashTable *hashtable;
-} _CacheIndex;
+  /* record the objects in this index */
+  GHashTable *hashtable;
+}
+_CacheIndex;
 
 typedef struct oc_index_identifier
 {
-   char *classname;
-   char *indexid;
-   _odl_index *index;
-} oc_index_identifier;
+  char *classname;
+  char *indexid;
+  _odl_index *index;
+}
+oc_index_identifier;
 
 #endif
Index: gnue/geas/src/objectstore/objectstore.c
diff -u gnue/geas/src/objectstore/objectstore.c:1.65 
gnue/geas/src/objectstore/objectstore.c:1.66
--- gnue/geas/src/objectstore/objectstore.c:1.65        Fri Jun  8 22:58:40 2001
+++ gnue/geas/src/objectstore/objectstore.c     Sun Jun 10 06:12:35 2001
@@ -1,9 +1,9 @@
 /*
-   Interface to the database backend(s)
+   objectstore.c - Interface to the database backend(s)
 
    Copyright (C) 2001 Free Software Foundation
 
-   This file is part of the GNU Enterprise Application Server (GEAS)
+   Part of the GNU Enterprise Application Server (GEAS)
 
    GEAS is free software; you can redistribute it and/or modify it under
    the terms of the GNU General Public License as published by the Free
@@ -19,7 +19,8 @@
    along with GEAS; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   $Id: objectstore.c,v 1.65 2001/06/09 05:58:40 baumannd Exp $
+   $Id: objectstore.c,v 1.66 2001/06/10 13:12:35 ntiffin Exp $
+   
 */
 
 #include "config.h"
@@ -142,9 +143,9 @@
   /* execute query (errors passed back automatically) */
   /* TODO: if error == unexpected disconnection then try to reconnect */
   /* self_test_message("Executing"); */
-/*   printf( "SQL: %s\n" , oql_query_as_sql(query,OQL_DBTYPE_CACHEONLY) ); */
+  /*   printf( "SQL: %s\n" , oql_query_as_sql(query,OQL_DBTYPE_CACHEONLY) ); */
   storeresult = h->execute (h, query, err, errmsg);
-/*   printf( "query done\n" ); */
+  /*   printf( "query done\n" ); */
 
 #ifdef DEBUG
   if (errmsg && *errmsg && debuglevel > 1)
@@ -177,7 +178,7 @@
   if (!classname || !key)
     return (NULL);
 
-/*   message("Deleting %s/%s from database",classname,key); */
+  /*   message("Deleting %s/%s from database",classname,key); */
 
   /* clear error indicators */
   if (err)
@@ -215,7 +216,7 @@
   if (!classname || !key)
     return (NULL);
 
-/*   message("Deleting %s from database where %s.%s = 
%s",classname,classname,fieldname,key); */
+  /* message("Deleting %s from database where %s.%s = 
%s",classname,classname,fieldname,key); */
 
   /* clear error indicators */
   if (err)