[GNUnet-SVN] r961 - in GNUnet/src: applications/fs/tools applications/stats util

[durner]

Author: durner
Date: 2005-06-19 13:53:01 -0700 (Sun, 19 Jun 2005)
New Revision: 961

Modified:
   GNUnet/src/applications/fs/tools/gnunet-download.c
   GNUnet/src/applications/stats/gnunet-stats.c
   GNUnet/src/util/statuscalls.c
Log:
MinGW

Modified: GNUnet/src/applications/fs/tools/gnunet-download.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-download.c  2005-06-19 19:14:59 UTC 
(rev 960)
+++ GNUnet/src/applications/fs/tools/gnunet-download.c  2005-06-19 20:53:01 UTC 
(rev 961)
@@ -153,7 +153,7 @@
     if (YES == testConfigurationString("GNUNET-DOWNLOAD",
                                       "VERBOSE",
                                       "YES")) {
-      printf(_("Download of file '%s' at %16llu out of %16llu bytes (%8.3f 
kbps)\n"),
+      PRINTF(_("Download of file '%s' at %16llu out of %16llu bytes (%8.3f 
kbps)\n"),
             event->data.DownloadProgress.filename,
             event->data.DownloadProgress.completed,
             event->data.DownloadProgress.total,
@@ -195,7 +195,7 @@
        SEMAPHORE_UP(signalFinished);
       }
     } else {
-      printf(_("Recursive download of directory '%s' at %llu of %llu 
bytes.\n"),
+      PRINTF(_("Recursive download of directory '%s' at %llu of %llu 
bytes.\n"),
             event->data.DownloadProgress.filename,
             event->data.DownloadProgress.completed,
             event->data.DownloadProgress.total);

Modified: GNUnet/src/applications/stats/gnunet-stats.c
===================================================================
--- GNUnet/src/applications/stats/gnunet-stats.c        2005-06-19 19:14:59 UTC 
(rev 960)
+++ GNUnet/src/applications/stats/gnunet-stats.c        2005-06-19 20:53:01 UTC 
(rev 961)
@@ -43,7 +43,7 @@
 static int printStatistics(const char * name,
                           unsigned long long value,
                           FILE * stream) {
-  fprintf(stream,
+  FPRINTF(stream,
          "%-60s: %16llu\n",
          name,
          value);

Modified: GNUnet/src/util/statuscalls.c
===================================================================
--- GNUnet/src/util/statuscalls.c       2005-06-19 19:14:59 UTC (rev 960)
+++ GNUnet/src/util/statuscalls.c       2005-06-19 20:53:01 UTC (rev 961)
@@ -391,7 +391,7 @@
       if (NULL != strstr(line, interfacePtrs[i]) ) {
        data = (char*)strchr(line, ':');
        data++; 
-       if (sscanf(data,
+       if (SSCANF(data,
                   "%llu %*s %*s %*s %*s %*s %*s %*s %llu",
                  &rxnew, &txnew) != 2) {
          fclose(proc_net_dev); 
@@ -494,7 +494,7 @@
          command);
     for (i=0; i < numInterfaces; i++) {
       if ( NULL != strstr(line, interfacePtrs[i]) ) {
-       if(sscanf(line, "%*s %*s %*s %*s %llu %*s %llu %*s %*s",
+       if(SSCANF(line, "%*s %*s %*s %*s %llu %*s %llu %*s %*s",
                  &rxnew, &txnew) != 2 ) {
          pclose(command);
          errexit(_("Failed to parse interface data '%s' output at %s:%d.\n"),
@@ -611,7 +611,7 @@
       if (NULL != strstr(line, interfacePtrs[i]) ) {
        data = (char*)strchr(line, ':');
        data++; 
-       if (sscanf(data,
+       if (SSCANF(data,
                   "%llu %*s %*s %*s %*s %*s %*s %*s %llu",
                  &rxnew, &txnew) != 2) {
          fclose(proc_net_dev);
@@ -714,7 +714,7 @@
          command);
     for (i=0; i < numInterfaces; i++) {
       if ( NULL != strstr(line, interfacePtrs[i]) ) {
-       if(sscanf(line, "%*s %*s %*s %*s %llu %*s %llu %*s %*s",
+       if(SSCANF(line, "%*s %*s %*s %*s %llu %*s %llu %*s %*s",
                  &rxnew, &txnew) != 2 ) {
          pclose(command);
          errexit(" reading interface data using netstat\n");