Changeset 30 in ntrip

Timestamp:

Apr 20, 2006, 10:37:23 AM (18 years ago)

Author:

stoecker

Message:

fixed warnings

Location:

trunk

Files:

• ntripserver/NtripLinuxServer.c (modified) (5 diffs)
• rtcm3torinex/rtcm3torinex.c (modified) (5 diffs)

trunk/ntripserver/NtripLinuxServer.c

@@ -41 +41 @@
  */
 
-/* $Id: NtripLinuxServer.c,v 1.12 2005/06/02 09:33:11 stoecker Exp $
+/* $Id: NtripLinuxServer.c,v 1.13 2005/06/07 14:47:52 stoecker Exp $
  * Changes - Version 0.7
  * Sep 22 2003  Steffen Tschirpke <St.Tschirpke@actina.de>
@@ -127 +127 @@
 static void usage(int);
 
-static void sighandler_alarm(/*int arg*/)
+#ifdef __GNUC__
+static __attribute__ ((noreturn)) void sighandler_alarm(
+int sig __attribute__((__unused__)))
+#else /* __GNUC__ */
+static void sighandler_alarm(int sig)
+#endif /* __GNUC__ */
 {
   fprintf(stderr, "ERROR: more than %d seconds no activity\n", ALARMTIME);
@@ -513 +518 @@
   char buffer[BUFSZ] = { 0 };
   char sisnetbackbuffer[200];
-  int nBufferBytes = 0, i;
+  int nBufferBytes = 0;
   /* data transmission */
   printf("transfering data ...\n");
@@ -557 +562 @@
     if(nBufferBytes)
     {
+      int i;
       /* send data */
       if((i = send(sock, buffer, (size_t)nBufferBytes, MSG_DONTWAIT))
@@ -717 +723 @@
  */
 
-static void usage(int rc)
+static
+#ifdef __GNUC__
+__attribute__ ((noreturn))
+#endif /* __GNUC__ */
+void usage(int rc)
 {
   fprintf(stderr, "Usage: %s [OPTIONS]\n", VERSION);

trunk/rtcm3torinex/rtcm3torinex.c

@@ -1 +1 @@
 /*
   Converter for RTCM3 data to RINEX.
-  $Id: rtcm3torinex.c,v 1.1 2006/01/12 16:19:10 stoecker Exp $
+  $Id: rtcm3torinex.c,v 1.2 2006/01/13 08:25:10 stoecker Exp $
   Copyright (C) 2005-2006 by Dirk Stoecker <stoecker@euronav.de>
 
@@ -42 +42 @@
 
 /* CVS revision and version */
-static char revisionstr[] = "$Revision: 1.1 $";
-static char datestr[]     = "$Date: 2006/01/12 16:19:10 $";
+static char revisionstr[] = "$Revision: 1.2 $";
+static char datestr[]     = "$Date: 2006/01/13 08:25:10 $";
 static int stop = 0;
 
@@ -607 +607 @@
 
   {
-    char *str;
+    const char *str;
     time_t t;
     struct tm * t2;
@@ -810 +810 @@
 
 /* let the output complete a block if necessary */
-static void signalhandler(int signal)
+static void signalhandler(int sig)
 {
   if(!stop)
   {
     fprintf(stderr, "Stop signal number %d received. "
-    "Trying to terminate gentle.\n", signal);
+    "Trying to terminate gentle.\n", sig);
     stop = 1;
     alarm(1);
@@ -824 +824 @@
 #ifdef __GNUC__
 static __attribute__ ((noreturn)) void signalhandler_alarm(
-int signal __attribute__((__unused__)))
+int sig __attribute__((__unused__)))
 #else /* __GNUC__ */
-static void signalhandler_alarm(int signal)
+static void signalhandler_alarm(int sig)
 #endif /* __GNUC__ */
 {