View Issue Details

IDProjectCategoryView StatusLast Update
0001617GNUnetutil librarypublic2011-09-19 10:45
ReporterLRN Assigned ToNDurner  
PriorityhighSeveritytrivialReproducibilityN/A
Status closedResolutionfixed 
Summary0001617: [PATCH] Fix one mistype and some errors in MINGW-only code
Descriptionsubj
apply with `patch -p 1 <blah-blah-blah.patch
TagsNo tags attached.
Attached Files
0001-Fix-one-mistype-and-some-errors-in-MINGW-only-code.patch (2,676 bytes)   
From 4122f7f6733af08c36f194b019bda0bf888bbbf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
Date: Wed, 10 Nov 2010 09:34:16 +0300
Subject: [PATCH] Fix one mistype and some errors in MINGW-only code

---
 src/util/connection.c |    2 +-
 src/util/scheduler.c  |    9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/util/connection.c b/src/util/connection.c
index 6067380..07f44fc 100644
--- a/src/util/connection.c
+++ b/src/util/connection.c
@@ -499,7 +499,7 @@ destroy_continuation (void *cls,
       if (sock->persist != GNUNET_YES)
       {
         if ( (GNUNET_YES != GNUNET_NETWORK_socket_shutdown (sock->sock, SHUT_RDWR)) &&
-	     (errno != ENOTCON) )
+	     (errno != ENOTCONN) )
           GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "shutdown");
       }
     }
diff --git a/src/util/scheduler.c b/src/util/scheduler.c
index f5b4bd8..0a4798b 100644
--- a/src/util/scheduler.c
+++ b/src/util/scheduler.c
@@ -1151,8 +1151,7 @@ GNUNET_SCHEDULER_add_delayed (struct GNUNET_TIME_Relative delay,
 
 #else
   /* unoptimized version */
-  return GNUNET_SCHEDULER_add_select (sched,
-                                      GNUNET_SCHEDULER_PRIORITY_KEEP,
+  return GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_KEEP,
                                       GNUNET_SCHEDULER_NO_TASK, delay,
                                       NULL, NULL, task, task_cls);
 #endif
@@ -1351,8 +1350,7 @@ GNUNET_SCHEDULER_add_read_file (struct GNUNET_TIME_Relative delay,
   GNUNET_assert (rfd != NULL);
   rs = GNUNET_NETWORK_fdset_create ();
   GNUNET_NETWORK_fdset_handle_set (rs, rfd);
-  ret = GNUNET_SCHEDULER_add_select (sched,
-                                     GNUNET_SCHEDULER_PRIORITY_KEEP,
+  ret = GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_KEEP,
                                      GNUNET_SCHEDULER_NO_TASK, delay,
                                      rs, NULL, task, task_cls);
   GNUNET_NETWORK_fdset_destroy (rs);
@@ -1400,8 +1398,7 @@ GNUNET_SCHEDULER_add_write_file (struct GNUNET_TIME_Relative delay,
   GNUNET_assert (wfd != NULL);
   ws = GNUNET_NETWORK_fdset_create ();
   GNUNET_NETWORK_fdset_handle_set (ws, wfd);
-  ret = GNUNET_SCHEDULER_add_select (sched,
-                                     GNUNET_SCHEDULER_PRIORITY_KEEP,
+  ret = GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_KEEP,
                                      GNUNET_SCHEDULER_NO_TASK,
                                      delay, NULL, ws, task, task_cls);
   GNUNET_NETWORK_fdset_destroy (ws);
-- 
1.7.3.1.msysgit.0

Activities

NDurner

2010-11-10 08:07

reporter   ~0004164

Committed revision 13629.

Issue History

Date Modified Username Field Change
2010-11-10 07:47 LRN New Issue
2010-11-10 07:47 LRN File Added: 0001-Fix-one-mistype-and-some-errors-in-MINGW-only-code.patch
2010-11-10 08:00 NDurner Status new => assigned
2010-11-10 08:00 NDurner Assigned To => NDurner
2010-11-10 08:07 NDurner Note Added: 0004164
2010-11-10 08:07 NDurner Status assigned => resolved
2010-11-10 08:07 NDurner Fixed in Version => Git master
2010-11-10 08:07 NDurner Resolution open => fixed
2010-12-23 23:50 Christian Grothoff Status resolved => closed
2011-09-19 10:45 Christian Grothoff Fixed in Version Git master => 0.9.0pre3
2011-09-19 10:45 Christian Grothoff Target Version Git master => 0.9.0pre3