[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/geas/src collectiondata.c collectiondata.h...
From: |
Neil Tiffin |
Subject: |
gnue/geas/src collectiondata.c collectiondata.h... |
Date: |
Sat, 09 Jun 2001 16:06:40 -0700 |
CVSROOT: /home/cvs
Module name: gnue
Changes by: Neil Tiffin <address@hidden> 01/06/09 16:06:40
Modified files:
geas/src : collectiondata.c collectiondata.h connection.c
event_log_code.h factory.c geas-skeleton.c
servantlocator.h
Log message:
Clean up more compiler warnings.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/collectiondata.c.diff?cvsroot=OldCVS&tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/collectiondata.h.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/connection.c.diff?cvsroot=OldCVS&tr1=1.60&tr2=1.61&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/event_log_code.h.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/factory.c.diff?cvsroot=OldCVS&tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/geas-skeleton.c.diff?cvsroot=OldCVS&tr1=1.61&tr2=1.62&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/servantlocator.h.diff?cvsroot=OldCVS&tr1=1.14&tr2=1.15&r1=text&r2=text
Patches:
Index: gnue/geas/src/collectiondata.c
diff -u gnue/geas/src/collectiondata.c:1.22 gnue/geas/src/collectiondata.c:1.23
--- gnue/geas/src/collectiondata.c:1.22 Sat Jun 9 08:27:02 2001
+++ gnue/geas/src/collectiondata.c Sat Jun 9 16:06:40 2001
@@ -19,7 +19,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- $Id: collectiondata.c,v 1.22 2001/06/09 15:27:02 ntiffin Exp $
+ $Id: collectiondata.c,v 1.23 2001/06/09 23:06:40 ntiffin Exp $
*/
@@ -131,15 +131,15 @@
for (i = 0; i < len; i++)
{
ObjectKey keydata;
- char *tmp;
+ /* char *tmp; */
debug_output (DEBUGLEVEL_3, "Item: %d of %d", i, len);
id = (char *) get_result_field (result, i /*row */ , idx /*field */ );
/* store a record of this object */
keydata = create_new_object_key ();
- tmp = object_key_as_string (keydata);
- ob = oc_add_empty_object ("geas::listitem", tmp);
+ /* tmp = object_key_as_string (keydata); */
+ ob = oc_add_empty_object ("geas::listitem", object_key_as_string
(keydata));
g_free (keydata);
/* store the object's details */
@@ -159,9 +159,11 @@
return (listid);
}
+#ifdef SELF_TEST
void
self_test_objectcontainer (void)
{
/* TODO */
printf ("\nSelf test object container is not implemented.\n");
}
+#endif
\ No newline at end of file
Index: gnue/geas/src/collectiondata.h
diff -u gnue/geas/src/collectiondata.h:1.5 gnue/geas/src/collectiondata.h:1.6
--- gnue/geas/src/collectiondata.h:1.5 Tue Feb 20 17:11:55 2001
+++ gnue/geas/src/collectiondata.h Sat Jun 9 16:06:40 2001
@@ -1,5 +1,8 @@
+
/*
- geas - GNU Enterprise Application Server
+ collectiondata.h
+
+ Part of GNU Enterprise Application Server (GEAS)
Copyright (C) 2001 Free Software Foundation
@@ -16,7 +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: collectiondata.h,v 1.6 2001/06/09 23:06:40 ntiffin Exp $
*/
#ifndef COLLECTIONDATA_H
@@ -28,24 +32,26 @@
/* manage collections of business objects in GEAS */
-/* get data */
-unsigned long int object_collection_length ( const char *holderid );
-const char *object_collection_classname( const char *holderid );
-const char *object_collection_object ( const char *holderid ,
unsigned long int index );
+/** \brief Get data. */
+unsigned long int object_collection_length (const char *holderid);
+const char *object_collection_classname (const char *holderid);
+const char *object_collection_object (const char *holderid,
+ unsigned long int index);
-/* once a connection isn't needed, delete it */
-void free_object_collection ( const char *holderid );
+/** \brief Once a connection isn't needed, delete it. */
+void free_object_collection (const char *holderid);
-/* fill an object collection with data */
+/** \brief Fill an object collection with data */
/* NOTE: query must provide object key as a string in field 'objectid' */
/* returns the ID of the new listholder object */
-char *new_object_collection_from_query( QueryData *query ,
- GEAS_object_reference *id ,
- CORBA_Environment *ev );
+char *new_object_collection_from_query (QueryData * query,
+ GEAS_object_reference
+ * id,
+ CORBA_Environment *
+ ev);
#ifdef SELF_TEST
-void self_test_objectcontainer( void );
+void self_test_objectcontainer (void);
#endif
#endif /* COLLECTIONDATA_H */
-
Index: gnue/geas/src/connection.c
diff -u gnue/geas/src/connection.c:1.60 gnue/geas/src/connection.c:1.61
--- gnue/geas/src/connection.c:1.60 Sat Jun 9 08:20:37 2001
+++ gnue/geas/src/connection.c Sat Jun 9 16:06:40 2001
@@ -20,7 +20,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- $Id: connection.c,v 1.60 2001/06/09 15:20:37 ntiffin Exp $
+ $Id: connection.c,v 1.61 2001/06/09 23:06:40 ntiffin Exp $
*/
@@ -951,6 +951,7 @@
return (CORBA_OBJECT_NIL);
}
+#if 0
static GEAS_ObjectList
old_Connection_executeQuery (GEAS_object_reference * id,
GEAS_Query_Query querytoperform,
@@ -1212,7 +1213,7 @@
CORBA_Object_release (list, ev);
return (retval);
}
-
+#endif
GEAS_LoadDefinition *
Connection_getReferenceDefinition (GEAS_object_reference * id,
@@ -1326,7 +1327,7 @@
{
if (result->success)
{
- char *res = get_result_field (result, 0, 0);
+ const char *res = get_result_field (result, 0, 0);
/* database independance? who needs that when you have grep */
retval = atoi (res);
}
Index: gnue/geas/src/event_log_code.h
diff -u gnue/geas/src/event_log_code.h:1.3 gnue/geas/src/event_log_code.h:1.4
--- gnue/geas/src/event_log_code.h:1.3 Sat Jun 9 08:20:37 2001
+++ gnue/geas/src/event_log_code.h Sat Jun 9 16:06:40 2001
@@ -19,7 +19,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- $Id: event_log_code.h,v 1.3 2001/06/09 15:20:37 ntiffin Exp $
+ $Id: event_log_code.h,v 1.4 2001/06/09 23:06:40 ntiffin Exp $
*/
#include <time.h>
@@ -91,7 +91,7 @@
}
static LoggableEvent *
-log_edit_event (char *classname, char *oid, char *fieldname)
+log_edit_event (const char *classname, const char *oid, const char *fieldname)
{
LoggableEvent *e = g_new0 (LoggableEvent, 1);
if (e)
@@ -119,7 +119,7 @@
static LoggableEvent *
-log_delete_event (char *classname, char *oid)
+log_delete_event (const char *classname, const char *oid)
{
LoggableEvent *e = g_new0 (LoggableEvent, 1);
if (e)
Index: gnue/geas/src/factory.c
diff -u gnue/geas/src/factory.c:1.16 gnue/geas/src/factory.c:1.17
--- gnue/geas/src/factory.c:1.16 Thu Jun 7 07:41:43 2001
+++ gnue/geas/src/factory.c Sat Jun 9 16:06:40 2001
@@ -21,7 +21,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- $Id: factory.c,v 1.16 2001/06/07 14:41:43 ntiffin Exp $
+ $Id: factory.c,v 1.17 2001/06/09 23:06:40 ntiffin Exp $
*/
@@ -55,7 +55,7 @@
/* GEAS_Connection retval = CORBA_OBJECT_NIL; */
GEAS_DataObject user;
ObjectKey key;
- char *sessionid;
+ /* char *sessionid; */
char *realpass;
/* find and verify the user's record */
@@ -102,7 +102,7 @@
key = create_new_object_key ();
if (key)
{
- sessionid = object_key_as_string (key);
+ const char *sessionid = object_key_as_string (key);
if (sessionid)
{
c = make_connection_reference (username, sessionid, ev);
Index: gnue/geas/src/geas-skeleton.c
diff -u gnue/geas/src/geas-skeleton.c:1.61 gnue/geas/src/geas-skeleton.c:1.62
--- gnue/geas/src/geas-skeleton.c:1.61 Sat Jun 9 06:35:12 2001
+++ gnue/geas/src/geas-skeleton.c Sat Jun 9 16:06:40 2001
@@ -19,7 +19,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- $Id: geas-skeleton.c,v 1.61 2001/06/09 13:35:12 reinhard Exp $
+ $Id: geas-skeleton.c,v 1.62 2001/06/09 23:06:40 ntiffin Exp $
*/
@@ -2807,7 +2807,7 @@
void
print_object_key (FILE * fp, ObjectKey key)
{
- char *k = object_key_as_string (key);
+ const char *k = object_key_as_string (key);
if (k)
fprintf (fp, k);
Index: gnue/geas/src/servantlocator.h
diff -u gnue/geas/src/servantlocator.h:1.14 gnue/geas/src/servantlocator.h:1.15
--- gnue/geas/src/servantlocator.h:1.14 Sat Jun 9 00:18:15 2001
+++ gnue/geas/src/servantlocator.h Sat Jun 9 16:06:40 2001
@@ -257,7 +257,7 @@
POA_PortableServer_ServantLocator servant;
PortableServer_POA poa;
} impl_POA_ServantLocator;
-
+/*
static PortableServer_ServantLocator *connection_locator;
static PortableServer_ServantLocator *dataobject_locator;
static PortableServer_ServantLocator *objectlist_locator;
@@ -265,7 +265,7 @@
static PortableServer_ServantLocator *transaction_locator;
static PortableServer_ServantLocator *query_locator;
static PortableServer_ServantLocator *constraint_locator;
-
+*/
static PortableServer_ServantManager
create_locator( PortableServer_POA root_poa ,
POA_PortableServer_ServantLocator__vepv *vepv , CORBA_Environment *ev )
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/geas/src collectiondata.c collectiondata.h...,
Neil Tiffin <=