gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r5979 - in GNUnet: m4 src/applications/dht/module src/appli


From: gnunet
Subject: [GNUnet-SVN] r5979 - in GNUnet: m4 src/applications/dht/module src/applications/sqstore_sqlite src/applications/topology_default src/setup src/setup/gtk src/setup/qt src/transports src/util/boot src/util/network src/util/os
Date: Wed, 19 Dec 2007 17:40:49 -0700 (MST)

Author: grothoff
Date: 2007-12-19 17:40:49 -0700 (Wed, 19 Dec 2007)
New Revision: 5979

Modified:
   GNUnet/m4/Makefile.in
   GNUnet/src/applications/dht/module/routing.c
   GNUnet/src/applications/sqstore_sqlite/sqlite.c
   GNUnet/src/applications/topology_default/topology.c
   GNUnet/src/setup/gnunet-setup.c
   GNUnet/src/setup/gtk/wizard_gtk.c
   GNUnet/src/setup/qt/gstring.h
   GNUnet/src/setup/qt/setupWizard.h
   GNUnet/src/transports/ip6.c
   GNUnet/src/util/boot/startup.c
   GNUnet/src/util/network/ip.c
   GNUnet/src/util/os/osconfig.c
   GNUnet/src/util/os/statuscalls.c
Log:
formatting

Modified: GNUnet/m4/Makefile.in
===================================================================
--- GNUnet/m4/Makefile.in       2007-12-20 00:39:26 UTC (rev 5978)
+++ GNUnet/m4/Makefile.in       2007-12-20 00:40:49 UTC (rev 5979)
@@ -34,14 +34,8 @@
 subdir = m4
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-       $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/iconv.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-       $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libcurl.m4 \
-       $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-       $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-       $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -83,6 +77,7 @@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUNETGTK_CFLAGS = @GNUNETGTK_CFLAGS@
 GNUNETGTK_LIBS = @GNUNETGTK_LIBS@
 GREP = @GREP@
@@ -94,6 +89,7 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LIBADD_DL = @LIBADD_DL@
 LIBCURL = @LIBCURL@
@@ -115,8 +111,8 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 MYSQL_CPPFLAGS = @MYSQL_CPPFLAGS@
 MYSQL_LDFLAGS = @MYSQL_LDFLAGS@
@@ -143,6 +139,7 @@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
 XMKMF = @XMKMF@
 XML2_CONFIG = @XML2_CONFIG@
 XML_CPPFLAGS = @XML_CPPFLAGS@

Modified: GNUnet/src/applications/dht/module/routing.c
===================================================================
--- GNUnet/src/applications/dht/module/routing.c        2007-12-20 00:39:26 UTC 
(rev 5978)
+++ GNUnet/src/applications/dht/module/routing.c        2007-12-20 00:40:49 UTC 
(rev 5979)
@@ -229,12 +229,14 @@
   if (hop_count > (diameter + 1) * 2)
     return 0;
   target_count =
-    target_replication / (target_replication * (hop_count+1) + diameter);
+    target_replication / (target_replication * (hop_count + 1) + diameter);
   target_value = 0;
   while (target_value < target_count)
     target_value++;
 #define LARGE_INT 0xFFFFFF
-  if ((target_count + 1 - target_value) > 
GNUNET_random_u32(GNUNET_RANDOM_QUALITY_WEAK, LARGE_INT) / ((double) LARGE_INT))
+  if ((target_count + 1 - target_value) >
+      GNUNET_random_u32 (GNUNET_RANDOM_QUALITY_WEAK,
+                         LARGE_INT) / ((double) LARGE_INT))
     target_value++;
   return target_value;
 }
@@ -618,12 +620,12 @@
                          i, PUT_TRIES);
 #endif
           store = 1;
-         continue;
+          continue;
         }
       else
-       {
-         j++;
-       }
+        {
+          j++;
+        }
       if (1 == GNUNET_hash_xorcmp (&next[j].hashPubKey,
                                    &coreAPI->myIdentity->hashPubKey,
                                    &put->key))

Modified: GNUnet/src/applications/sqstore_sqlite/sqlite.c
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/sqlite.c     2007-12-20 00:39:26 UTC 
(rev 5978)
+++ GNUnet/src/applications/sqstore_sqlite/sqlite.c     2007-12-20 00:40:49 UTC 
(rev 5979)
@@ -768,7 +768,7 @@
                   sqlite3_finalize (stmt_1);
                   sqlite3_finalize (stmt_2);
                   GNUNET_mutex_unlock (lock);
-                 GNUNET_free(datum_1);
+                  GNUNET_free (datum_1);
                   return GNUNET_SYSERR;
                 }
               sqlite3_reset (stmt_2);

Modified: GNUnet/src/applications/topology_default/topology.c
===================================================================
--- GNUnet/src/applications/topology_default/topology.c 2007-12-20 00:39:26 UTC 
(rev 5978)
+++ GNUnet/src/applications/topology_default/topology.c 2007-12-20 00:40:49 UTC 
(rev 5979)
@@ -545,7 +545,7 @@
                          GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
                          _("Failed to read friends list from `%s'\n"), fn);
           GNUNET_free (fn);
-          GNUNET_free (data);    
+          GNUNET_free (data);
           return GNUNET_SYSERR;
         }
       GNUNET_free (fn);
@@ -599,7 +599,7 @@
                          _
                          ("More friendly connections required than target 
total number of connections.\n"));
         }
-      GNUNET_free (data);        
+      GNUNET_free (data);
     }
   return 0;
 }

Modified: GNUnet/src/setup/gnunet-setup.c
===================================================================
--- GNUnet/src/setup/gnunet-setup.c     2007-12-20 00:39:26 UTC (rev 5978)
+++ GNUnet/src/setup/gnunet-setup.c     2007-12-20 00:40:49 UTC (rev 5979)
@@ -173,11 +173,11 @@
     }
   mptr (argc, argv, library, ectx, cfg,
 #if HAVE_GUILE
-   gns,
+        gns,
 #else
-   NULL,
+        NULL,
 #endif
-    filename, config_daemon);
+        filename, config_daemon);
   GNUNET_plugin_unload (library);
   return GNUNET_YES;
 }

Modified: GNUnet/src/setup/gtk/wizard_gtk.c
===================================================================
--- GNUnet/src/setup/gtk/wizard_gtk.c   2007-12-20 00:39:26 UTC (rev 5978)
+++ GNUnet/src/setup/gtk/wizard_gtk.c   2007-12-20 00:40:49 UTC (rev 5979)
@@ -175,7 +175,9 @@
     {
       GNUNET_GC_get_configuration_value_string (editCfg,
                                                 "NETWORK",
-                                                "INTERFACE", 
GNUNET_DEFAULT_INTERFACE, &val);
+                                                "INTERFACE",
+                                                GNUNET_DEFAULT_INTERFACE,
+                                                &val);
       gtk_combo_box_append_text (GTK_COMBO_BOX (cls.cmbNIC), val);
       gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter);
       gtk_combo_box_set_active_iter (GTK_COMBO_BOX (cls.cmbNIC), &iter);
@@ -283,7 +285,7 @@
         user_name = GNUNET_strdup ("gnunet");
       else
         {
-         GNUNET_free_non_null(uname);
+          GNUNET_free_non_null (uname);
           uname = getenv ("USER");
           if (uname != NULL)
             user_name = GNUNET_strdup (uname);
@@ -298,7 +300,7 @@
   if (NULL == gname || strlen (gname) == 0)
     {
       struct group *grp;
-      
+
       if ((geteuid () == 0) || (NULL != getgrnam ("gnunet")))
         group_name = GNUNET_strdup ("gnunet");
       else
@@ -338,8 +340,8 @@
   gtk_widget_set_sensitive (entGroup, cap);
 
   gtk_widget_show (curwnd);
-  GNUNET_free_non_null(uname);
-  GNUNET_free_non_null(gname);
+  GNUNET_free_non_null (uname);
+  GNUNET_free_non_null (gname);
 }
 
 

Modified: GNUnet/src/setup/qt/gstring.h
===================================================================
--- GNUnet/src/setup/qt/gstring.h       2007-12-20 00:39:26 UTC (rev 5978)
+++ GNUnet/src/setup/qt/gstring.h       2007-12-20 00:40:49 UTC (rev 5979)
@@ -29,31 +29,31 @@
 
 #include <QtCore/QString>
 
-class GString : public QString
+class GString:public QString
 {
 public:
-  GString();
-  GString(const char *str);
-  GString(QString &src);
-  ~GString();
-  GString &operator=(const QString &src);
-  GString &operator=(const GString &src);
-  GString &operator=(const char *src);
+  GString ();
+  GString (const char *str);
+    GString (QString & src);
+   ~GString ();
+    GString & operator= (const QString & src);
+    GString & operator= (const GString & src);
+    GString & operator= (const char *src);
 
  /**
   * @brief Return the content as C string
   */
- char *toCString();
+  char *toCString ();
 
  /**
   * @brief Return the content as UTF-8 encoded C string
   */
- char *toUtf8CStr();
- 
+  char *toUtf8CStr ();
+
 protected:
   char *cstr;
 };
 
-#endif /*GNUNET_STRING_H_*/
+#endif /*GNUNET_STRING_H_ */
 
 /* end of gstring.h */

Modified: GNUnet/src/setup/qt/setupWizard.h
===================================================================
--- GNUnet/src/setup/qt/setupWizard.h   2007-12-20 00:39:26 UTC (rev 5978)
+++ GNUnet/src/setup/qt/setupWizard.h   2007-12-20 00:40:49 UTC (rev 5979)
@@ -28,19 +28,28 @@
 {
   Q_OBJECT
 public:
-  GSetupWizard (QDialog * parent, struct GNUNET_GE_Context *ectx, struct 
GNUNET_GC_Configuration *cfg, const char *cfg_fn);
+  GSetupWizard (QDialog * parent, struct GNUNET_GE_Context *ectx,
+                struct GNUNET_GC_Configuration *cfg, const char *cfg_fn);
 
-protected slots:
-  void nextClicked();
-  void prevClicked();
-  void abortClicked();
+  protected
+    slots:void
+  nextClicked ();
+  void
+  prevClicked ();
+  void
+  abortClicked ();
 protected:
-  QString header();
-  void loadDefaults();
-  int saveConf();
+  QString
+  header ();
+  void
+  loadDefaults ();
+  int
+  saveConf ();
 
-  unsigned int curPage;
-  const char *cfg_fn;
+  unsigned int
+    curPage;
+  const char *
+    cfg_fn;
   struct GNUNET_GE_Context *
     ectx;
   struct GNUNET_GC_Configuration *

Modified: GNUnet/src/transports/ip6.c
===================================================================
--- GNUnet/src/transports/ip6.c 2007-12-20 00:39:26 UTC (rev 5978)
+++ GNUnet/src/transports/ip6.c 2007-12-20 00:40:49 UTC (rev 5979)
@@ -101,7 +101,8 @@
   if (-1 == GNUNET_GC_get_configuration_value_string (cfg,
                                                       "NETWORK",
                                                       "INTERFACE",
-                                                      
GNUNET_DEFAULT_INTERFACE, &interfaces))
+                                                      GNUNET_DEFAULT_INTERFACE,
+                                                      &interfaces))
     {
       GNUNET_GE_LOG (ectx,
                      GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,

Modified: GNUnet/src/util/boot/startup.c
===================================================================
--- GNUnet/src/util/boot/startup.c      2007-12-20 00:39:26 UTC (rev 5978)
+++ GNUnet/src/util/boot/startup.c      2007-12-20 00:40:49 UTC (rev 5979)
@@ -112,9 +112,9 @@
               rdir[pos] = '\0';
               if (mkdir (rdir
 #ifndef MINGW
-              , S_IRUSR | S_IWUSR | S_IXUSR
+                         , S_IRUSR | S_IWUSR | S_IXUSR
 #endif
-              ) == 0)
+                  ) == 0)
                 {
                   GNUNET_file_change_owner (nctx, rdir, user);
                 }

Modified: GNUnet/src/util/network/ip.c
===================================================================
--- GNUnet/src/util/network/ip.c        2007-12-20 00:39:26 UTC (rev 5978)
+++ GNUnet/src/util/network/ip.c        2007-12-20 00:40:49 UTC (rev 5979)
@@ -79,7 +79,8 @@
   if (-1 == GNUNET_GC_get_configuration_value_string (cfg,
                                                       "NETWORK",
                                                       "INTERFACE",
-                                                      
GNUNET_DEFAULT_INTERFACE, &interfaces))
+                                                      GNUNET_DEFAULT_INTERFACE,
+                                                      &interfaces))
     {
       GNUNET_GE_LOG (ectx,
                      GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
@@ -143,7 +144,8 @@
   if (-1 == GNUNET_GC_get_configuration_value_string (cfg,
                                                       "NETWORK",
                                                       "INTERFACE",
-                                                      
GNUNET_DEFAULT_INTERFACE, &interfaces))
+                                                      GNUNET_DEFAULT_INTERFACE,
+                                                      &interfaces))
     {
       GNUNET_GE_LOG (ectx,
                      GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,

Modified: GNUnet/src/util/os/osconfig.c
===================================================================
--- GNUnet/src/util/os/osconfig.c       2007-12-20 00:39:26 UTC (rev 5978)
+++ GNUnet/src/util/os/osconfig.c       2007-12-20 00:40:49 UTC (rev 5979)
@@ -87,7 +87,8 @@
       *dst = 0;
 
       if ((entry[0] != '\0') &&
-          (GNUNET_OK != proc (entry, strcmp (entry, GNUNET_DEFAULT_INTERFACE) 
== 0, cls)))
+          (GNUNET_OK !=
+           proc (entry, strcmp (entry, GNUNET_DEFAULT_INTERFACE) == 0, cls)))
         break;
 
       while ((c != '\n') && (c != EOF))

Modified: GNUnet/src/util/os/statuscalls.c
===================================================================
--- GNUnet/src/util/os/statuscalls.c    2007-12-20 00:39:26 UTC (rev 5978)
+++ GNUnet/src/util/os/statuscalls.c    2007-12-20 00:40:49 UTC (rev 5979)
@@ -377,7 +377,8 @@
   if (-1 == GNUNET_GC_get_configuration_value_string (cfg,
                                                       "LOAD",
                                                       "INTERFACES",
-                                                      
GNUNET_DEFAULT_INTERFACE, &interfaces))
+                                                      GNUNET_DEFAULT_INTERFACE,
+                                                      &interfaces))
     return GNUNET_SYSERR;
   if (interfaces == NULL)
     {





reply via email to

[Prev in Thread] Current Thread [Next in Thread]