.dc -> .pc

typecasting and #includes to get rid of compiler warnings

diff --git a/server/Imakefile b/server/Imakefile
index 6ab2adbbba6579b0daba45f4209caede54f9fc6e..a2c5b80decb24778fd02d94ae673dcf50b7e2f02 100644 (file)
--- a/server/Imakefile
+++ b/server/Imakefile
@@ -18,10 +18,10 @@ SRCS = startmoira.c mr_main.c mr_sauth.c mr_scall.c \
        qfollow.c
 CODE= startmoira.c mr_main.c mr_sauth.c mr_scall.c \
        mr_srvdata.c mr_shutdown.c mr_util.c \
-       mr_server.h query.h qrtn.h qrtn.dc \
-       qsupport.dc qsubs.c queries2.c increment.dc \
-       cache.dc mr_glue.c qvalidate.dc Imakefile \
-       qaccess.dc qsetup.dc qfollow.dc
+       mr_server.h query.h qrtn.h qrtn.pc \
+       qsupport.pc qsubs.c queries2.c increment.pc \
+       cache.pc mr_glue.c qvalidate.pc Imakefile \
+       qaccess.pc qsetup.pc qfollow.pc
 SRVOBJ=mr_main.o mr_sauth.o mr_scall.o mr_srvdata.o mr_shutdown.o \
        mr_util.o qrtn.o queries2.o qsupport.o qsubs.o \
        increment.o cache.o qvalidate.o \
@@ -42,7 +42,7 @@ program(startmoira, startmoira.o,${MR_LIBDEP} ${GDB_LIBDEP},\
        .././gdb/libmrgdb.a -lcom_err -lkrb -ldes -lhesiod,\
        ${PROGDIR})
 library_obj_rule()
-install_library_target(mrglue,$(GLUOBJS),$(SRCS),)
+install_library_target(mrglue,$(GLUOBJS),$(SRCS))
 
 sqlfile(cache)
 sqlfile(increment)

diff --git a/server/cache.dc b/server/cache.pc
similarity index 97%
rename from server/cache.dc
rename to server/cache.pc
index 0fe1896ecc93e9207b5f5396f70fb173470430df..fa155d3d2e74f3fa5b01050cdb65edf27ae439c3 100644 (file)
--- a/server/cache.dc
+++ b/server/cache.pc
@@ -334,14 +334,6 @@ void flush_name(name, type)
 
     h = hashname(name, type);
 
-    /* first clear it out of the transaction chain */
-    for (i = &cachehead; i && i->trans; i = i->trans) {
-        if (!strcmp(name, i->trans->name) && type==i->trans->type) {
-           i->trans = i->trans->trans;
-       }
-    }
-
-    /* now remove it */
     for (i = cachehead.next; i != &cachehead; i = i->next) {
        if (!strcmp(name, i->name) && type==i->type) {
            cachesize--;

diff --git a/server/increment.dc b/server/increment.pc
similarity index 100%
rename from server/increment.dc
rename to server/increment.pc

diff --git a/server/mr_glue.c b/server/mr_glue.c
index dfe95f7495553ace2a3a846fdf5ed332a5df7edb..6643a24c84b390c25d4b2932124409bc8259c0a9 100644 (file)
--- a/server/mr_glue.c
+++ b/server/mr_glue.c
@@ -139,7 +139,8 @@ int mr_query(name, argc, argv, callproc, callarg)
     hints.hint = callarg;
     next_incremental();
     return mr_process_query(&pseudo_client, name, argc,
-                           mr_copy_args(argv, argc), callback, &hints);
+                           mr_copy_args(argv, argc), callback,
+                           (char *)&hints);
 
 }
 
@@ -166,7 +167,8 @@ int mr_query_internal(argc, argv, callproc, callarg)
     hints.hint = callarg;
     next_incremental();
     return mr_process_query(&pseudo_client, argv[0], argc-1,
-                           mr_copy_args(argv+1, argc-1), callback, &hints);
+                           mr_copy_args(argv+1, argc-1), callback,
+                           (char *)&hints);
 }
 
 int mr_access_internal(argc, argv)

diff --git a/server/mr_scall.c b/server/mr_scall.c
index 56a545e4bb5f01dd0f9b4bcb1b16d2b0777e5ac0..0301881259e8e251eaaae741cf38aa32e69365fd 100644 (file)
--- a/server/mr_scall.c
+++ b/server/mr_scall.c
@@ -19,6 +19,7 @@ static char *rcsid_sms_scall_c = "$Header$";
 #include <sys/file.h>
 #include <fcntl.h>
 #include <string.h>
+#include <arpa/inet.h>
 #include <krb.h>
 #include <errno.h>
 #include "mr_server.h"
@@ -245,7 +246,6 @@ list_users(callbk, callarg)
        char buf1[30];
        int i;
        extern client **clients;
-       extern char *inet_ntoa();
        char *cp;
        char *ctime();
 

diff --git a/server/mr_server.h b/server/mr_server.h
index cafb3a5ed7cf212d0f1ff7b0f06bf45cbdb666ae..93f73d0610879c57f851f589fa43c0f016008a02 100644 (file)
--- a/server/mr_server.h
+++ b/server/mr_server.h
@@ -129,9 +129,9 @@ int op_select(LIST_OF_OPERATIONS, int, fd_set *, fd_set *, fd_set *,
 
 /* prototypes from libmoira */
 struct save_queue *sq_create(void);
-void sq_save_data(struct save_queue *sq, void *data);
-void sq_save_unique_data(struct save_queue *sq, void *data);
-void sq_save_args(int argc, void *argv[], struct save_queue *sq);
+int sq_save_data(struct save_queue *sq, void *data);
+int sq_save_unique_data(struct save_queue *sq, void *data);
+int sq_save_args(int argc, void *argv[], struct save_queue *sq);
 int sq_get_data(struct save_queue *sq, void *data);
 int sq_remove_data(struct save_queue *sq, void *data);
 int sq_empty(struct save_queue *sq);

diff --git a/server/mr_util.c b/server/mr_util.c
index 3ff7b674b2cb632b868ec1de10840dfe1a085304..af7e266f24b6a474ab560166762189e25a6ba218 100644 (file)
--- a/server/mr_util.c
+++ b/server/mr_util.c
@@ -14,7 +14,7 @@ static char *rcsid_mr_util_c = "$Header$";
 
 #include <mit-copyright.h>
 #include "mr_server.h"
-
+#include <com_err.h>
 #include <ctype.h>
 #include <sys/types.h>
 #include <string.h>
@@ -75,7 +75,6 @@ void mr_com_err(whoami, code, fmt, pvar)
        char *fmt;
        caddr_t pvar;
 {
-       extern char *error_message();
        extern client *cur_client;
        
        if (whoami) {

diff --git a/server/qaccess.dc b/server/qaccess.pc
similarity index 100%
rename from server/qaccess.dc
rename to server/qaccess.pc

diff --git a/server/qfollow.dc b/server/qfollow.pc
similarity index 99%
rename from server/qfollow.dc
rename to server/qfollow.pc
index 89962303ba6817bb0a7045c4059ca7c58e029aef..686b26f19c77ea0bacae2e5c6b799aa73442c2ec 100644 (file)
--- a/server/qfollow.dc
+++ b/server/qfollow.pc
@@ -1243,13 +1243,13 @@ int _sdl_followup(q, argv, cl)
     int i;
     i = atoi(argv[0]);
     log_flags = i;
-#ifsql INGRES
+#ifdef INGRES
     if (i & LOG_SQL) {
        EXEC SQL set printqry;
     } else {
        EXEC SQL set noprintqry;
     }
-#endsql
+#endif
     return(MR_SUCCESS);
 }
 

diff --git a/server/qrtn.dc b/server/qrtn.pc
similarity index 99%
rename from server/qrtn.dc
rename to server/qrtn.pc
index 21c415147ebc6ce51fc89d9ff39628fcd8354eae..7ef15e131091957caa2ec2cd1a606cd1ab8778e7 100644 (file)
--- a/server/qrtn.dc
+++ b/server/qrtn.pc
@@ -225,7 +225,8 @@ int mr_process_query(cl, name, argc, argv_ro, action, actarg)
        if (q->rvar) {
            if (v && v->post_rtn) {
                sq = sq_create();
-               status = do_retrieve(q, pqual, psort, sq_save_args, sq);
+               status = do_retrieve(q, pqual, psort, sq_save_args,
+                                    (char *)sq);
                if (status != MR_SUCCESS) {
                    sq_destroy(sq);
                    break;
@@ -614,7 +615,7 @@ int do_retrieve(q, pqual, psort, action, actarg)
       strcat(stmt_buf,psort);
     }
 
-    return do_for_all_rows(stmt_buf, q->vcnt, action, actarg);
+    return do_for_all_rows(stmt_buf, q->vcnt, action, (int)actarg);
 }
 
 char *sqlstrstr(str, pat)

diff --git a/server/qsetup.dc b/server/qsetup.pc
similarity index 100%
rename from server/qsetup.dc
rename to server/qsetup.pc

diff --git a/server/qsubs.c b/server/qsubs.c
index 2f239885b54005ab10055ab348d4d7f2d31d7898..d3ea74438d22109c30cf49d63ef5483730e6bbb0 100644 (file)
--- a/server/qsubs.c
+++ b/server/qsubs.c
@@ -64,7 +64,7 @@ get_query_by_name(name, version)
 void list_queries(version, action, actarg)
     int version;
     int (*action)();
-    int actarg;
+    char *actarg;
 {
   register struct query *q;
   register int i;
@@ -122,7 +122,7 @@ void list_queries(version, action, actarg)
 void help_query(q, action, actarg)
     register struct query *q;
     int (*action)();
-    int actarg;
+    char *actarg;
 {
     register int argcount;
     register int i;

diff --git a/server/qsupport.dc b/server/qsupport.pc
similarity index 99%
rename from server/qsupport.dc
rename to server/qsupport.pc
index b27183cd60c4c254151e8a5595a3454f2bebd6b8..2ef8246de3d2923595ef102f5a28df4df1de9667 100644 (file)
--- a/server/qsupport.dc
+++ b/server/qsupport.pc
@@ -136,7 +136,7 @@ int get_list_info(q, aargv, cl, action, actarg)
     {
         EXEC SQL FETCH csr102 INTO :id;
        if(sqlca.sqlcode!=0) break;
-       sq_save_data(sq, id);
+       sq_save_data(sq, (char *)id);
         rowcount++;
     }
     EXEC SQL CLOSE csr102;
@@ -538,7 +538,7 @@ int get_ace_use(q, argv, cl, action, actarg)
 
     sq = sq_create();
     if (!strcmp(atype, "RLIST")) {
-       sq_save_data(sq, aid);
+       sq_save_data(sq, (char *)aid);
        /* get all the list_id's of containing lists */
        EXEC SQL DECLARE csr107 CURSOR FOR
          SELECT list_id FROM imembers
@@ -551,7 +551,7 @@ int get_ace_use(q, argv, cl, action, actarg)
        while(1) {
            EXEC SQL FETCH csr107 INTO :listid;
            if(sqlca.sqlcode != 0) break;
-           sq_save_unique_data(sq, listid);
+           sq_save_unique_data(sq, (char *)listid);
        }
        EXEC SQL CLOSE csr107;
        /* now process each one */
@@ -573,7 +573,7 @@ int get_ace_use(q, argv, cl, action, actarg)
        while(1) {
            EXEC SQL FETCH csr108 INTO :listid;
            if(sqlca.sqlcode != 0) break;
-           sq_save_data(sq, listid);
+           sq_save_data(sq, (char *)listid);
        }
        EXEC SQL CLOSE csr108;
        /* now process each one */
@@ -597,7 +597,7 @@ int get_ace_use(q, argv, cl, action, actarg)
        while(1) {
            EXEC SQL FETCH csr109 INTO :listid;
            if(sqlca.sqlcode != 0) break;
-           sq_save_data(sq, listid);
+           sq_save_data(sq, (char*)listid);
        }
        EXEC SQL CLOSE csr109;
        /* now process each one */
@@ -947,7 +947,8 @@ int gmol_internal(q, argv, cl, action, actarg, flag)
        if (sqlca.sqlcode != 0) break;
        if (members++ > 49)
          break;
-       sq_save_data(sq, ((int)member_type[0] << 24) | (member_id & 0xffffff));
+       sq_save_data(sq, (char *)(((int)member_type[0] << 24) |
+                                 (member_id & 0xffffff)));
     }
     EXEC SQL CLOSE csr118;
 

diff --git a/server/query.h b/server/query.h
index 16defd14433d6fb99320a1789e3db1ce7ff61d51..3087652aab7222bacf58d19ab205e02f0a694d41 100644 (file)
--- a/server/query.h
+++ b/server/query.h
@@ -93,6 +93,6 @@ int check_query_access(struct query *q, char *argv[], client *cl);
 int set_next_object_id(char *objectx, enum tables table, int limit);
 
 /* prototypes from qsubs.c */
-void list_queries(int version, int (*action)(), int actarg);
-void help_query(struct query *q, int (*action)(), int actarg);
+void list_queries(int version, int (*action)(), char *actarg);
+void help_query(struct query *q, int (*action)(), char *actarg);
 struct query *get_query_by_name(char *name, int version);

diff --git a/server/qvalidate.dc b/server/qvalidate.pc
similarity index 99%
rename from server/qvalidate.dc
rename to server/qvalidate.pc
index b2966b4c3caf53260625f91f1a416e0a11d46184..910cef5ca065527c64556267aad6fe32ac375e10 100644 (file)
--- a/server/qvalidate.dc
+++ b/server/qvalidate.pc
@@ -41,6 +41,8 @@ int lock_table(struct valobj *vo);
 int readlock_table(struct valobj *vo);
 int convert_wildcards_uppercase(char *arg);
 
+extern SQLDA *sqlald(int,int,int);
+
 EXEC SQL WHENEVER SQLERROR DO dbmserr();
 
 /* Validation Routines */

diff --git a/server/startmoira.c b/server/startmoira.c
index f35fa07fe6cf14c834a6c90977c2fcc5c58b7a80..74cd79ba50b34e6b4d6c368e1f5421065b1e9762 100644 (file)
--- a/server/startmoira.c
+++ b/server/startmoira.c
@@ -17,13 +17,15 @@ static char *rcsid_mr_starter_c = "$Header$";
 #endif lint
 
 #include <mit-copyright.h>
+#include <errno.h>
 #include <stdio.h>
-#include <strings.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/file.h>
 #include <sys/wait.h>
 #include <sys/signal.h>
 #include <sys/ioctl.h>
+#include <time.h>
 #include <fcntl.h>
 #include <sys/resource.h>
 #include <moira_site.h>
@@ -35,7 +37,7 @@ int rdpipe[2];
 extern int errno;
 char *whoami;
 
-cleanup()
+void cleanup()
 {
        int stat, serrno = errno;
        char buf[BUFSIZ];
@@ -135,7 +137,6 @@ main(argc, argv)
        
        do {
                char *time_s;
-               extern char *ctime();
                long foo;
                
                done = 0;