[GNUnet-SVN] [gnunet] branch master updated (4ec4b3ce5 -> 12923bdf5)

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a change to branch master
in repository gnunet.

    from 4ec4b3ce5 files included by accident.
     new 0e7e66ebc typo in header file for w32
     new 12923bdf5 fix variable names renamed by search and replace.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/arm/gnunet-service-arm.c     | 6 +++---
 src/gns/gnunet_w32nsp_lib.h      | 6 +++---
 src/util/container_bloomfilter.c | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index a05257563..b0f7e07c4 100644
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -31,7 +31,7 @@
 
 #define LOG(kind, ...) GNUNET_log_from (kind, "util", __VA_ARGS__)
 
-#define LOG_strerror(kind, syscall) \
+#define LOG_STRERROR(kind, syscall) \
   GNUNET_log_from_strerror (kind, "util", syscall)
 
 
@@ -373,7 +373,7 @@ get_server_addresses (const char *service_name,
       if ((ENOBUFS == errno) || (ENOMEM == errno) || (ENFILE == errno) ||
           (EACCES == errno))
       {
-        LOG_strerror (GNUNET_ERROR_TYPE_ERROR, "socket");
+        LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "socket");
         return GNUNET_SYSERR;
       }
       LOG (GNUNET_ERROR_TYPE_INFO,
@@ -464,7 +464,7 @@ get_server_addresses (const char *service_name,
       if ((ENOBUFS == errno) || (ENOMEM == errno) || (ENFILE == errno) ||
           (EACCES == errno))
       {
-        LOG_strerror (GNUNET_ERROR_TYPE_ERROR, "socket");
+        LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "socket");
         GNUNET_free_non_null (hostname);
         GNUNET_free (unixpath);
         return GNUNET_SYSERR;
diff --git a/src/gns/gnunet_w32nsp_lib.h b/src/gns/gnunet_w32nsp_lib.h
index bd1360acd..1c17efefe 100644
--- a/src/gns/gnunet_w32nsp_lib.h
+++ b/src/gns/gnunet_w32nsp_lib.h
@@ -1,9 +1,9 @@
-#if !defined(GNUENT_W32NSP_LIB_H)
-#define GNUENT_W32NSP_LIB_H
+#if !defined(GNUNET_W32NSP_LIB_H)
+#define GNUNET_W32NSP_LIB_H
 
 #include <basetyps.h>
 
 /* E0D24085-622C-4A93-9A0018-034469DE28DA */
 DEFINE_GUID (GNUNET_NAMESPACE_PROVIDER_DNS, 0xE0D24085L, 0x622C, 0x4A93, 0x9A, 
0x18, 0x03, 0x44, 0x69, 0xDE, 0x28, 0xDA);
 
-#endif /* GNUENT_W32NSP_LIB_H */
\ No newline at end of file
+#endif /* GNUNET_W32NSP_LIB_H */
diff --git a/src/util/container_bloomfilter.c b/src/util/container_bloomfilter.c
index fe7d86421..a4033defe 100644
--- a/src/util/container_bloomfilter.c
+++ b/src/util/container_bloomfilter.c
@@ -45,10 +45,10 @@
 #define LOG(kind, ...) \
   GNUNET_log_from (kind, "util-container-bloomfilter", __VA_ARGS__)
 
-#define LOG_strerror(kind, syscall) \
+#define LOG_STRERROR(kind, syscall) \
   GNUNET_log_from_strerror (kind, "util-container-bloomfilter", syscall)
 
-#define LOG_strerror_FILE(kind, syscall, filename)             \
+#define LOG_STRERROR_FILE(kind, syscall, filename)             \
   GNUNET_log_from_strerror_file (kind,                         \
                                  "util-container-bloomfilter", \
                                  syscall,                      \
@@ -599,7 +599,7 @@ GNUNET_CONTAINER_bloomfilter_load (const char *filename,
     res = GNUNET_DISK_file_read (bf->fh, rbuff, BUFFSIZE);
     if (res == -1)
     {
-      LOG_strerror_FILE (GNUNET_ERROR_TYPE_WARNING, "read", bf->filename);
+      LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "read", bf->filename);
       GNUNET_free (rbuff);
       GNUNET_free (bf->filename);
       GNUNET_DISK_file_close (bf->fh);

-- 
To stop receiving notification emails like this one, please contact
address@hidden.