fix ftbfs

9 files changed, 129 insertions, 128 deletions

diff --git a/src/fs/gnunet-fs-gtk_download-save-as.c b/src/fs/gnunet-fs-gtk_download-save-as.c
index b9da6609..cc5592dd 100644
--- a/src/fs/gnunet-fs-gtk_download-save-as.c
+++ b/src/fs/gnunet-fs-gtk_download-save-as.c
@@ -78,7 +78,7 @@ clean_up_download_as_context (struct DownloadAsDialogContext *dlc)
   g_object_unref (G_OBJECT (dlc->builder));
   if (NULL != dlc->dirname)
   {
-    if (0 != RMDIR (dlc->dirname))
+    if (0 != rmdir (dlc->dirname))
       GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
                                 "rmdir",
                                 dlc->dirname);
@@ -206,12 +206,12 @@ GNUNET_GTK_save_as_dialog_response_cb (GtkDialog *dialog,
 
 /*
 ** FIXME: implement handling for corner cases:
- * A) Selection changes in search tab while SaveAs dialog is open.
- *    If it's in direct download mode, ignore that; otherwise destroy the dialog.
- * B) Download! is pressed in download panel (or the search result is otherwise
- *    being downloaded without using saveas dialog) while SaveAs dialog is open.
- *    Destroy SaveAs dialog.
- */
+* A) Selection changes in search tab while SaveAs dialog is open.
+*    If it's in direct download mode, ignore that; otherwise destroy the dialog.
+* B) Download! is pressed in download panel (or the search result is otherwise
+*    being downloaded without using saveas dialog) while SaveAs dialog is open.
+*    Destroy SaveAs dialog.
+*/
 static void
 open_saveas_dialog (struct DownloadEntry *de, int download_directly)
 {
@@ -263,11 +263,12 @@ open_saveas_dialog (struct DownloadEntry *de, int download_directly)
 
     dirname = GNUNET_strdup (de->filename);
     basename = (char *) GNUNET_STRINGS_get_short_name (dirname);
-    /* basename now points into 'dirname'; cut 'dirname' off at the '/' before basename */
+    /* basename now points into 'dirname'; cut 'dirname' off at the '/' before
+     * basename */
     if (basename > dirname)
       basename[-1] = '\0';
 
-    if (0 != STAT (dirname, &sbuf))
+    if (0 != stat (dirname, &sbuf))
     {
       if (GNUNET_OK != GNUNET_DISK_directory_create (dirname))
       {
diff --git a/src/fs/gnunet-fs-gtk_publish-dialog.c b/src/fs/gnunet-fs-gtk_publish-dialog.c
index bcd10d30..4ad1c091 100644
--- a/src/fs/gnunet-fs-gtk_publish-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-dialog.c
@@ -1410,7 +1410,7 @@ add_item (struct AddDirClientContext *adcc,
   struct stat sbuf;
   uint64_t fsize;
 
-  if (0 != STAT (item->filename, &sbuf))
+  if (0 != stat (item->filename, &sbuf))
   {
     GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "stat", item->filename);
     return;
diff --git a/src/namestore/plugin_gtk_namestore_box.c b/src/namestore/plugin_gtk_namestore_box.c
index 82f8fae0..86366cf5 100644
--- a/src/namestore/plugin_gtk_namestore_box.c
+++ b/src/namestore/plugin_gtk_namestore_box.c
@@ -1,22 +1,22 @@
 /*
-  * This file is part of GNUnet
-  * Copyright (C) 2009-2014 GNUnet e.V.
-  *
-  * GNUnet is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published
-  * by the Free Software Foundation; either version 3, or (at your
-  * option) any later version.
-  *
-  * GNUnet is distributed in the hope that it will be useful, but
-  * WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  * General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with GNUnet; see the file COPYING.  If not, write to the
-  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  * Boston, MA 02110-1301, USA.
-  */
+ * This file is part of GNUnet
+ * Copyright (C) 2009-2014 GNUnet e.V.
+ *
+ * GNUnet is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 3, or (at your
+ * option) any later version.
+ *
+ * GNUnet is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNUnet; see the file COPYING.  If not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
 /**
  * @file namestore/plugin_gtk_namestore_box.c
  * @brief namestore plugin for editing BOXed records
@@ -99,7 +99,7 @@ box_load (void *cls, gchar *n_value, GtkBuilder *builder)
   char rest[slen];
 
   if (4 !=
-      SSCANF (n_value, "%u %u %u %s", &protocol, &service, &record_type, rest))
+      sscanf (n_value, "%u %u %u %s", &protocol, &service, &record_type, rest))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _ ("Unable to parse (boxed) BOX record `%s'\n"),
diff --git a/src/namestore/plugin_gtk_namestore_mx.c b/src/namestore/plugin_gtk_namestore_mx.c
index bc9b299b..9ab96cb0 100644
--- a/src/namestore/plugin_gtk_namestore_mx.c
+++ b/src/namestore/plugin_gtk_namestore_mx.c
@@ -1,22 +1,22 @@
 /*
-  * This file is part of GNUnet
-  * Copyright (C) 2009-2013 GNUnet e.V.
-  *
-  * GNUnet is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published
-  * by the Free Software Foundation; either version 3, or (at your
-  * option) any later version.
-  *
-  * GNUnet is distributed in the hope that it will be useful, but
-  * WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  * General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with GNUnet; see the file COPYING.  If not, write to the
-  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  * Boston, MA 02110-1301, USA.
-  */
+ * This file is part of GNUnet
+ * Copyright (C) 2009-2013 GNUnet e.V.
+ *
+ * GNUnet is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 3, or (at your
+ * option) any later version.
+ *
+ * GNUnet is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNUnet; see the file COPYING.  If not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
 
 /**
  * @file namestore/plugin_gtk_namestore_mx.c
@@ -58,7 +58,7 @@ mx_load (void *cls, gchar *n_value, GtkBuilder *builder)
   uint16_t mx_pref;
   char result[253 + 1];
 
-  if (2 != SSCANF (n_value, "%hu,%253s", &mx_pref, result))
+  if (2 != sscanf (n_value, "%hu,%253s", &mx_pref, result))
   {
     GNUNET_break (0);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
diff --git a/src/namestore/plugin_gtk_namestore_soa.c b/src/namestore/plugin_gtk_namestore_soa.c
index 69b856f6..0dfc893e 100644
--- a/src/namestore/plugin_gtk_namestore_soa.c
+++ b/src/namestore/plugin_gtk_namestore_soa.c
@@ -1,22 +1,22 @@
 /*
-  * This file is part of GNUnet
-  * Copyright (C) 2009-2013 GNUnet e.V.
-  *
-  * GNUnet is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published
-  * by the Free Software Foundation; either version 3, or (at your
-  * option) any later version.
-  *
-  * GNUnet is distributed in the hope that it will be useful, but
-  * WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  * General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with GNUnet; see the file COPYING.  If not, write to the
-  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  * Boston, MA 02110-1301, USA.
-  */
+ * This file is part of GNUnet
+ * Copyright (C) 2009-2013 GNUnet e.V.
+ *
+ * GNUnet is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 3, or (at your
+ * option) any later version.
+ *
+ * GNUnet is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNUnet; see the file COPYING.  If not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
 
 /**
  * @file namestore/plugin_gtk_namestore_soa.c
@@ -81,7 +81,7 @@ soa_load (void *cls, gchar *n_value, GtkBuilder *builder)
   unsigned int soa_expire;
   unsigned int soa_min;
 
-  if (7 != SSCANF (n_value,
+  if (7 != sscanf (n_value,
                    "rname=%253s mname=%253s %u,%u,%u,%u,%u",
                    soa_rname,
                    soa_mname,
diff --git a/src/namestore/plugin_gtk_namestore_srv.c b/src/namestore/plugin_gtk_namestore_srv.c
index 8707f179..0616263c 100644
--- a/src/namestore/plugin_gtk_namestore_srv.c
+++ b/src/namestore/plugin_gtk_namestore_srv.c
@@ -1,22 +1,22 @@
 /*
-  * This file is part of GNUnet
-  * Copyright (C) 2009-2014 GNUnet e.V.
-  *
-  * GNUnet is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published
-  * by the Free Software Foundation; either version 3, or (at your
-  * option) any later version.
-  *
-  * GNUnet is distributed in the hope that it will be useful, but
-  * WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  * General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with GNUnet; see the file COPYING.  If not, write to the
-  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  * Boston, MA 02110-1301, USA.
-  */
+ * This file is part of GNUnet
+ * Copyright (C) 2009-2014 GNUnet e.V.
+ *
+ * GNUnet is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 3, or (at your
+ * option) any later version.
+ *
+ * GNUnet is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNUnet; see the file COPYING.  If not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
 /**
  * @file namestore/plugin_gtk_namestore_srv.c
  * @brief namestore plugin for editing SRV records
@@ -92,7 +92,7 @@ srv_load (void *cls, gchar *n_value, GtkBuilder *builder)
   char target_name[253 + 1];
   GtkTreeModel *tm;
 
-  if (7 != SSCANF (n_value,
+  if (7 != sscanf (n_value,
                    "%u %u %u %u %u %u %253s",
                    &protocol,
                    &service,
diff --git a/src/namestore/plugin_gtk_namestore_tlsa.c b/src/namestore/plugin_gtk_namestore_tlsa.c
index 719d51cc..d235c08e 100644
--- a/src/namestore/plugin_gtk_namestore_tlsa.c
+++ b/src/namestore/plugin_gtk_namestore_tlsa.c
@@ -1,22 +1,22 @@
 /*
-  * This file is part of GNUnet
-  * Copyright (C) 2009-2014 GNUnet e.V.
-  *
-  * GNUnet is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published
-  * by the Free Software Foundation; either version 3, or (at your
-  * option) any later version.
-  *
-  * GNUnet is distributed in the hope that it will be useful, but
-  * WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  * General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with GNUnet; see the file COPYING.  If not, write to the
-  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  * Boston, MA 02110-1301, USA.
-  */
+ * This file is part of GNUnet
+ * Copyright (C) 2009-2014 GNUnet e.V.
+ *
+ * GNUnet is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 3, or (at your
+ * option) any later version.
+ *
+ * GNUnet is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNUnet; see the file COPYING.  If not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
 /**
  * @file namestore/plugin_gtk_namestore_tlsa.c
  * @brief namestore plugin for editing TLSA records
@@ -203,7 +203,7 @@ tlsa_load (void *cls, gchar *n_value, GtkBuilder *builder)
   size_t slen = strlen (n_value) + 1;
   char cert_data[slen];
 
-  if (7 != SSCANF (n_value,
+  if (7 != sscanf (n_value,
                    "%u %u %u %u %u %u %s",
                    &protocol,
                    &service,
@@ -804,7 +804,7 @@ import_address_cb (void *cls, const struct sockaddr *addr, socklen_t addrlen)
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 _ ("Failed to connect to target address `%s': %s\n"),
                 GNUNET_a2s (addr, addrlen),
-                STRERROR (errno));
+                strerror (errno));
     GNUNET_NETWORK_socket_close (ic->sock);
     return;
   }
diff --git a/src/namestore/plugin_gtk_namestore_vpn.c b/src/namestore/plugin_gtk_namestore_vpn.c
index 8a563051..39e92bf0 100644
--- a/src/namestore/plugin_gtk_namestore_vpn.c
+++ b/src/namestore/plugin_gtk_namestore_vpn.c
@@ -1,22 +1,22 @@
 /*
-  * This file is part of GNUnet
-  * Copyright (C) 2009-2013 GNUnet e.V.
-  *
-  * GNUnet is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published
-  * by the Free Software Foundation; either version 3, or (at your
-  * option) any later version.
-  *
-  * GNUnet is distributed in the hope that it will be useful, but
-  * WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  * General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with GNUnet; see the file COPYING.  If not, write to the
-  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  * Boston, MA 02110-1301, USA.
-  */
+ * This file is part of GNUnet
+ * Copyright (C) 2009-2013 GNUnet e.V.
+ *
+ * GNUnet is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 3, or (at your
+ * option) any later version.
+ *
+ * GNUnet is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNUnet; see the file COPYING.  If not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
 
 /**
  * @file namestore/plugin_gtk_namestore_vpn.c
@@ -60,7 +60,7 @@ vpn_load (void *cls, gchar *n_value, GtkBuilder *builder)
   char s_serv[253 + 1];
   unsigned int proto;
 
-  if (3 != SSCANF (n_value, "%u %53s %253s", &proto, s_peer, s_serv))
+  if (3 != sscanf (n_value, "%u %53s %253s", &proto, s_peer, s_serv))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _ ("Unable to parse VPN record string `%s'\n"),
diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index 4e9ff6f4..2b95f4d4 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -483,7 +483,7 @@ run (void *cls)
     (void) GNUNET_CONFIGURATION_load (cfg, option_cfg_name);
   else
     (void) GNUNET_CONFIGURATION_load (cfg, NULL);
-  if (0 != ACCESS (option_cfg_name, W_OK))
+  if (0 != access (option_cfg_name, W_OK))
   {
     if (ENOENT == errno)
     {
@@ -496,7 +496,7 @@ run (void *cls)
       while ((len > 0) && (dirname[len] != DIR_SEPARATOR))
         len--;
       dirname[len] = '\0';
-      if (0 != ACCESS (dirname, X_OK | W_OK | R_OK))
+      if (0 != access (dirname, X_OK | W_OK | R_OK))
       {
         if (ENOENT == errno)
           errno = EACCES; /* really means somewhere access was denied */
@@ -510,7 +510,7 @@ run (void *cls)
         stderr,
         "Refusing to start as I will be unable to write configuration file `%s': %s\n",
         option_cfg_name,
-        STRERROR (errno));
+        strerror (errno));
       GNUNET_GTK_main_loop_quit (ml);
       return;
     }