tighten formatting rules

15 files changed, 46 insertions, 38 deletions

diff --git a/src/conversation/conversation_api.c b/src/conversation/conversation_api.c
index eb070e56e..daf51042a 100644
--- a/src/conversation/conversation_api.c
+++ b/src/conversation/conversation_api.c
@@ -62,7 +62,6 @@ enum CallerState
 };
 
 
-
 /**
  * A caller is the handle we have for an incoming call.
  */
@@ -867,4 +866,5 @@ GNUNET_CONVERSATION_caller_resume (struct GNUNET_CONVERSATION_Caller *caller,
   }
 }
 
+
 /* end of conversation_api.c */
diff --git a/src/conversation/gnunet-conversation-test.c b/src/conversation/gnunet-conversation-test.c
index c03723fc3..307b55435 100644
--- a/src/conversation/gnunet-conversation-test.c
+++ b/src/conversation/gnunet-conversation-test.c
@@ -261,4 +261,5 @@ main (int argc,
   return ret;
 }
 
+
 /* end of gnunet-conversation-test.c */
diff --git a/src/conversation/gnunet-conversation.c b/src/conversation/gnunet-conversation.c
index 0b04ba38e..6c0a6e42f 100644
--- a/src/conversation/gnunet-conversation.c
+++ b/src/conversation/gnunet-conversation.c
@@ -258,8 +258,7 @@ phone_event_handler (void *cls,
        ring_my_bell();
      *
      * see https://gstreamer.freedesktop.org/documentation/application-development/highlevel/playback-components.html on how to play a wav using the gst framework being used here
-     */
-    fprintf (
+     */fprintf (
       stdout,
       _ (
         "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"),
@@ -1229,4 +1228,5 @@ main (int argc, char *const *argv)
   return (GNUNET_OK == ret) ? 0 : 1;
 }
 
+
 /* end of gnunet-conversation.c */
diff --git a/src/conversation/gnunet-helper-audio-playback.c b/src/conversation/gnunet-helper-audio-playback.c
index d7e1cd036..dfa400d71 100644
--- a/src/conversation/gnunet-helper-audio-playback.c
+++ b/src/conversation/gnunet-helper-audio-playback.c
@@ -262,6 +262,7 @@ write_wav_header ()
   return ! ret ? -1 : 16;
 }
 
+
 #endif
 
 
@@ -397,7 +398,7 @@ ogg_demux_and_decode ()
     {
       /*OggOpus streams are identified by a magic string in the initial
          stream header.*/
-      if (op.b_o_s &&(op.bytes >= 8) && ! memcmp (op.packet, "OpusHead", 8))
+      if (op.b_o_s && (op.bytes >= 8) && ! memcmp (op.packet, "OpusHead", 8))
       {
         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                     "Got Opus Header\n");
@@ -418,7 +419,7 @@ ogg_demux_and_decode ()
         }
         if (! has_opus_stream)
         {
-          if ((packet_count > 0) &&(opus_serialno == os.serialno) )
+          if ((packet_count > 0) && (opus_serialno == os.serialno) )
           {
             fprintf (stderr,
                      "\nError: Apparent chaining without changing serial number (%"
@@ -443,7 +444,7 @@ ogg_demux_and_decode ()
                    (int64_t) os.serialno);
         }
       }
-      if (! has_opus_stream ||(os.serialno != opus_serialno) )
+      if (! has_opus_stream || (os.serialno != opus_serialno) )
       {
         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                     "breaking out\n");
@@ -458,9 +459,9 @@ ogg_demux_and_decode ()
         if (! dec)
           quit (1);
 
-        if ((0 != ogg_stream_packetout (&os, &op)) ||(255 ==
-                                                      og.header[og.header_len
-                                                                - 1]) )
+        if ((0 != ogg_stream_packetout (&os, &op)) || (255 ==
+                                                       og.header[og.header_len
+                                                                 - 1]) )
         {
           /*The format specifies that the initial header and tags packets are on their
              own pages. To aid implementors in discovering that their files are wrong
@@ -490,9 +491,9 @@ ogg_demux_and_decode ()
       else if (1 == packet_count)
       {
         has_tags_packet = 1;
-        if ((0 != ogg_stream_packetout (&os, &op)) ||(255 ==
-                                                      og.header[og.header_len
-                                                                - 1]) )
+        if ((0 != ogg_stream_packetout (&os, &op)) || (255 ==
+                                                       og.header[og.header_len
+                                                                 - 1]) )
         {
           fprintf (stderr,
                    "Extra packets on initial tags page. Invalid stream.\n");
@@ -506,7 +507,7 @@ ogg_demux_and_decode ()
         int64_t outsamp;
 
         /*End of stream condition*/
-        if (op.e_o_s &&(os.serialno == opus_serialno) )
+        if (op.e_o_s && (os.serialno == opus_serialno) )
         {
           GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                       "Got EOS\n");
diff --git a/src/conversation/gnunet-helper-audio-record-gst.c b/src/conversation/gnunet-helper-audio-record-gst.c
index a3607014e..883dd9eea 100644
--- a/src/conversation/gnunet-helper-audio-record-gst.c
+++ b/src/conversation/gnunet-helper-audio-record-gst.c
@@ -108,6 +108,7 @@ quit ()
     gst_element_set_state (pipeline, GST_STATE_NULL);
 }
 
+
 static gboolean
 bus_call (GstBus *bus, GstMessage *msg, gpointer data)
 {
@@ -141,6 +142,7 @@ bus_call (GstBus *bus, GstMessage *msg, gpointer data)
   return TRUE;
 }
 
+
 void
 source_child_added (GstChildProxy *child_proxy, GObject *object, gchar *name,
                     gpointer user_data)
@@ -150,6 +152,7 @@ source_child_added (GstChildProxy *child_proxy, GObject *object, gchar *name,
                   (gint64) LATENCY_TIME, NULL);
 }
 
+
 static void
 signalhandler (int s)
 {
diff --git a/src/conversation/gnunet-helper-audio-record.c b/src/conversation/gnunet-helper-audio-record.c
index 16311cf69..633030a64 100644
--- a/src/conversation/gnunet-helper-audio-record.c
+++ b/src/conversation/gnunet-helper-audio-record.c
@@ -774,6 +774,7 @@ ogg_init ()
   }
 }
 
+
 /**
  * The main function for the record helper.
  *
diff --git a/src/conversation/gnunet_gst.c b/src/conversation/gnunet_gst.c
index 7703215bb..d776189cd 100644
--- a/src/conversation/gnunet_gst.c
+++ b/src/conversation/gnunet_gst.c
@@ -62,6 +62,7 @@ BREAKOUT:
   return;
 }
 
+
 /***
  * load gnunet configuration
  */
@@ -142,6 +143,7 @@ gg_load_configuration (GNUNET_gstData *d)
 //  GNUNET_CONFIGURATION_write(cfg, "mediahelper.conf");
 }
 
+
 static void
 write_data (const char *ptr, size_t msg_size)
 {
@@ -163,7 +165,6 @@ write_data (const char *ptr, size_t msg_size)
 }
 
 
-
 extern GstFlowReturn
 on_appsink_new_sample (GstElement *element, GNUNET_gstData *d)
 {
@@ -179,9 +180,7 @@ on_appsink_new_sample (GstElement *element, GNUNET_gstData *d)
    char *si_str;
    GstCaps *s_caps;
    char *caps_str;
- */
-
-  if (gst_app_sink_is_eos (GST_APP_SINK (element)))
+ */if (gst_app_sink_is_eos (GST_APP_SINK (element)))
     return GST_FLOW_OK;
 
   // pull sample from appsink
@@ -198,7 +197,6 @@ on_appsink_new_sample (GstElement *element, GNUNET_gstData *d)
   GST_WARNING ("caps are %" GST_PTR_FORMAT, gst_sample_get_caps (s));
 
 
-
   gst_buffer_map (b, &map, GST_MAP_READ);
 
   size_t len;
@@ -226,6 +224,7 @@ on_appsink_new_sample (GstElement *element, GNUNET_gstData *d)
   return GST_FLOW_OK;
 }
 
+
 /***
  * Dump a pipeline graph
  */
@@ -248,7 +247,6 @@ pl_graph (GstElement *pipeline)
 }
 
 
-
 extern gboolean
 gnunet_gst_bus_call (GstBus *bus, GstMessage *msg, gpointer data)
 {
@@ -286,6 +284,7 @@ gnunet_gst_bus_call (GstBus *bus, GstMessage *msg, gpointer data)
   return TRUE;
 }
 
+
 /* called when pipeline changes state */
 extern void
 state_changed_cb (GstBus *bus, GstMessage *msg, GNUNET_gstData *d)
@@ -326,6 +325,7 @@ state_changed_cb (GstBus *bus, GstMessage *msg, GNUNET_gstData *d)
   }
 }
 
+
 static void
 application_cb (GstBus *bus, GstMessage *msg, GNUNET_gstData *data)
 {
@@ -333,6 +333,7 @@ application_cb (GstBus *bus, GstMessage *msg, GNUNET_gstData *data)
   return;
 }
 
+
 static void
 error_cb (GstBus *bus, GstMessage *msg, GNUNET_gstData *data)
 {
@@ -340,6 +341,7 @@ error_cb (GstBus *bus, GstMessage *msg, GNUNET_gstData *data)
   return;
 }
 
+
 static void
 eos_cb (GstBus *bus, GstMessage *msg, GNUNET_gstData *data)
 {
@@ -347,6 +349,7 @@ eos_cb (GstBus *bus, GstMessage *msg, GNUNET_gstData *data)
   return;
 }
 
+
 extern void
 gg_setup_gst_bus (GNUNET_gstData *d)
 {
@@ -367,6 +370,7 @@ gg_setup_gst_bus (GNUNET_gstData *d)
   gst_object_unref (bus);
 }
 
+
 /*
  * take buffer from gstreamer and feed it to gnunet
  */
@@ -543,7 +547,6 @@ feed_buffer_to_gst (const char *audio, size_t b_len, GNUNET_gstData *d)
 }
 
 
-
 /**
  * debug making elements
  */
@@ -567,6 +570,7 @@ gst_element_factory_make_debug (gchar *factoryname, gchar *name)
   }
 }
 
+
 /*
    static gboolean
    gst_element_link_many_debug(...)
@@ -585,6 +589,7 @@ lf (char *msg)
   exit (10);
 }
 
+
 /***
  * used to set properties on autoaudiosink's chosen sink
  */
@@ -601,6 +606,7 @@ autoaudiosink_child_added (GstChildProxy *child_proxy,
                   NULL);
 }
 
+
 /***
  * used to set properties on autoaudiosource's chosen sink
  */
@@ -624,6 +630,7 @@ get_pipeline (GstElement *element)
   return GST_ELEMENT (p);
 }
 
+
 static void
 decoder_ogg_pad_added (GstElement *element,
                        GstPad *pad,
@@ -682,6 +689,7 @@ gnunet_read (GNUNET_gstData *d)
   return 0;
 }
 
+
 /**
  * Message callback
  *
@@ -802,6 +810,7 @@ get_app (GNUNET_gstData *d, int type)
   return bin;
 }
 
+
 extern GstBin *
 get_coder (GNUNET_gstData *d, int type)
 {
@@ -824,8 +833,7 @@ get_coder (GNUNET_gstData *d, int type)
           "sprop-stereo", G_TYPE_STRING, "0",
           "encoding-params", G_TYPE_STRING, "2",
           NULL);
- */
-    rtpcaps = gst_caps_new_simple ("application/x-rtp",
+ */ rtpcaps = gst_caps_new_simple ("application/x-rtp",
                                    "media", G_TYPE_STRING, "audio",
                                    "clock-rate", G_TYPE_INT, SAMPLING_RATE,
                                    "encoding-name", G_TYPE_STRING, "OPUS",
@@ -1013,8 +1021,7 @@ get_audiobin (GNUNET_gstData *d, int type)
          "enough-data",
          G_CALLBACK(appsrc_enough_data),
          NULL);
-       */
-/*
+       *//*
       g_signal_connect (queue,
           "notify::current-level-bytes",
           G_CALLBACK(queue_current_level),
@@ -1039,11 +1046,7 @@ get_audiobin (GNUNET_gstData *d, int type)
           "pushing",
           G_CALLBACK(queue_pushing),
           NULL);
- */
-    }
-
-
-
+ */ }
 
 
     gst_bin_add_many (bin, conv, resampler, sink, NULL);
diff --git a/src/conversation/gnunet_gst_def.h b/src/conversation/gnunet_gst_def.h
index bbadc5f92..7bfcc5e53 100644
--- a/src/conversation/gnunet_gst_def.h
+++ b/src/conversation/gnunet_gst_def.h
@@ -84,7 +84,6 @@
 // static struct AudioMessage *audio_message;
 
 
-
 typedef struct GNUNET_gstData GNUNET_gstData;
 struct GNUNET_gstData
 {
@@ -106,8 +105,6 @@ struct GNUNET_gstData
 };
 
 
-
-
 #define DEBUG_READ_PURE_OGG 1
 #define DEBUG_RECORD_PURE_OGG 1
 
diff --git a/src/conversation/gnunet_gst_test.c b/src/conversation/gnunet_gst_test.c
index 884b0fe83..98054797c 100644
--- a/src/conversation/gnunet_gst_test.c
+++ b/src/conversation/gnunet_gst_test.c
@@ -34,7 +34,6 @@ main (int argc, char *argv[])
   GstElement *gnunetsrc, *gnunetsink, *source, *sink, *encoder, *decoder;
 
 
-
   // audio_message = GNUNET_malloc (UINT16_MAX);
   // audio_message->header.type = htons (GNUNET_MESSAGE_TYPE_CONVERSATION_AUDIO);
 
@@ -51,9 +50,7 @@ main (int argc, char *argv[])
    gst->audiobackend = JACK;
    gst->dropsilence = TRUE;
    gst->usertp = FALSE;
- */
-  /* Initialize GStreamer */
-  gst_init (&argc, &argv);
+ *//* Initialize GStreamer */gst_init (&argc, &argv);
 
   gst->pipeline = GST_PIPELINE (gst_pipeline_new ("gnunet-media-helper"));
 
@@ -118,8 +115,7 @@ main (int argc, char *argv[])
          GstFlowReturn flow;
          flow = on_appsink_new_sample (gst->appsink, gst);
     }
- */
-  }
+ */}
   if (type == SPEAKER)
   {
     while (1)
diff --git a/src/conversation/microphone.c b/src/conversation/microphone.c
index 5ab115c1f..a4a40796f 100644
--- a/src/conversation/microphone.c
+++ b/src/conversation/microphone.c
@@ -196,4 +196,5 @@ GNUNET_MICROPHONE_destroy (struct GNUNET_MICROPHONE_Handle *microphone)
   GNUNET_free (microphone);
 }
 
+
 /* end of microphone.c */
diff --git a/src/conversation/plugin_gnsrecord_conversation.c b/src/conversation/plugin_gnsrecord_conversation.c
index 9f7299c15..2ea2f48f0 100644
--- a/src/conversation/plugin_gnsrecord_conversation.c
+++ b/src/conversation/plugin_gnsrecord_conversation.c
@@ -258,4 +258,5 @@ libgnunet_plugin_gnsrecord_conversation_done (void *cls)
   return NULL;
 }
 
+
 /* end of plugin_gnsrecord_conversation.c */
diff --git a/src/conversation/speaker.c b/src/conversation/speaker.c
index 8703f269d..38eb1159c 100644
--- a/src/conversation/speaker.c
+++ b/src/conversation/speaker.c
@@ -185,4 +185,5 @@ GNUNET_SPEAKER_destroy (struct GNUNET_SPEAKER_Handle *speaker)
   GNUNET_free (speaker);
 }
 
+
 /* end of speaker.c */
diff --git a/src/conversation/test_conversation_api.c b/src/conversation/test_conversation_api.c
index 66b800304..2b717367a 100644
--- a/src/conversation/test_conversation_api.c
+++ b/src/conversation/test_conversation_api.c
@@ -501,4 +501,5 @@ main (int argc, char *argv[])
   return ok;
 }
 
+
 /* end of test_conversation_api.c */
diff --git a/src/conversation/test_conversation_api_reject.c b/src/conversation/test_conversation_api_reject.c
index 53f700890..62e4109b0 100644
--- a/src/conversation/test_conversation_api_reject.c
+++ b/src/conversation/test_conversation_api_reject.c
@@ -354,4 +354,5 @@ main (int argc, char *argv[])
   return ok;
 }
 
+
 /* end of test_conversation_api_reject.c */
diff --git a/src/conversation/test_conversation_api_twocalls.c b/src/conversation/test_conversation_api_twocalls.c
index 71f97b1d7..fab49f7d7 100644
--- a/src/conversation/test_conversation_api_twocalls.c
+++ b/src/conversation/test_conversation_api_twocalls.c
@@ -633,4 +633,5 @@ main (int argc, char *argv[])
   return 1;
 }
 
+
 /* end of test_conversation_api_twocalls.c */