[refactor] fix intent in some files

src/teleport-app.c

@@ -48,7 +48,7 @@ G_DEFINE_TYPE (TeleportApp, teleport_app, GTK_TYPE_APPLICATION);
 void save_file_callback (GSimpleAction *simple,
                          GVariant      *parameter,
                          gpointer       user_data) {
-  do_downloading(g_variant_get_string (g_variant_get_child_value (parameter, 0), NULL),
+  teleport_get_do_downloading(g_variant_get_string (g_variant_get_child_value (parameter, 0), NULL),
                               g_variant_get_string (g_variant_get_child_value (parameter, 1), NULL),
                               g_variant_get_string (g_variant_get_child_value (parameter, 2), NULL));
 }

src/teleport-browser.c

@@ -22,8 +22,7 @@ static AvahiThreadedPoll *threaded_poll = NULL;
 static AvahiClient *client = NULL;
 static TeleportPeer *peerList = NULL;
 
-static void resolve_callback(
+static void resolve_callback (AvahiServiceResolver *r,
-    AvahiServiceResolver *r,
                               AVAHI_GCC_UNUSED AvahiIfIndex interface,
                               AVAHI_GCC_UNUSED AvahiProtocol protocol,
                               AvahiResolverEvent event,

src/teleport-get.c

@@ -2,18 +2,20 @@
 #include <config.h>
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include <libsoup/soup.h>
 #include "teleport-app.h"
 #include "teleport-get.h"
 
+static int saveFile (SoupMessage *, const gchar *, const gchar *);
+static gchar * getFilePath (const gchar *, const gchar *);
+static int get (const gchar *, const gchar *, const gchar *, const gchar *);
+
 static gboolean debug;
 
 static void
-finished (SoupSession *session, SoupMessage *msg, gpointer target)
+finished (SoupSession *session,
+          SoupMessage *msg,
+          gpointer target)
 {
   //GVariant *target array: {originDevice, url, filename, downloadDirectory}
   if ((char *) g_variant_get_string (
@@ -33,8 +35,8 @@ finished (SoupSession *session, SoupMessage *msg, gpointer target)
   }
 }
 
-int
+static int
-get (char *url,
+get (const gchar *url,
      const gchar *originDevice,
      const gchar *downloadDirectory,
      const gchar *outputFilename) {
@@ -48,9 +50,12 @@ get (char *url,
   }
 
   session = g_object_new (SOUP_TYPE_SESSION,
-      SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_CONTENT_DECODER,
+                          SOUP_SESSION_ADD_FEATURE_BY_TYPE,
-      SOUP_SESSION_USER_AGENT, "teleport ",
+                          SOUP_TYPE_CONTENT_DECODER,
-      SOUP_SESSION_ACCEPT_LANGUAGE_AUTO, TRUE,
+                          SOUP_SESSION_USER_AGENT,
+                          "teleport ",
+                          SOUP_SESSION_ACCEPT_LANGUAGE_AUTO,
+                          TRUE,
                           NULL);
 
   if (debug) {
@@ -85,7 +90,7 @@ get (char *url,
   return 0;
 }
 
-int 
+static int 
 saveFile (SoupMessage *msg,
           const gchar *outputDirectory,
           const gchar *outputFilename) {
@@ -123,14 +128,8 @@ saveFile (SoupMessage *msg,
   return 0;
 }
 
-int
-do_client_notify (char *url) {
-  get (g_strdup(url), NULL, NULL, NULL);
-  g_print("Offering selected file to other machine.\n");
-  return 0;
-}
 
-gchar *
+static gchar *
 getFilePath (const gchar *outputDirectory,
              const gchar *outputFilename) {
   return g_strdup_printf("%s/%s", outputDirectory,
@@ -138,7 +137,14 @@ getFilePath (const gchar *outputDirectory,
 }
 
 int
-do_downloading (const char *originDevice,
+teleport_get_do_client_notify (const gchar *url) {
+  get (g_strdup(url), NULL, NULL, NULL);
+  g_print("Offering selected file to other machine.\n");
+  return 0;
+}
+
+int 
+teleport_get_do_downloading (const char *originDevice,
                              const char *url,
                              const char *filename) {
   const gchar *outputDirectory = g_get_user_special_dir(G_USER_DIRECTORY_DOWNLOAD);

src/teleport-get.h

@@ -3,11 +3,9 @@
 
 #include <libsoup/soup.h>
 
-extern int do_downloading(const char *, const char *, const char *);
+int teleport_get_do_downloading   (const gchar *,
-extern int do_client_notify(char *);
+                                   const gchar *,
-
+                                   const gchar *);
-int saveFile (SoupMessage *, const gchar *, const gchar *);
+int teleport_get_do_client_notify (const gchar *);
-gchar * getFilePath (const gchar *, const gchar *);
-int get (char *, const gchar *, const gchar *, const gchar *);
 
 #endif /* __TELEPORT_GET_H */

src/teleport-server.c

@@ -252,7 +252,7 @@ int addRouteToServer(char *name, char *file_to_send, char *destination) {
   file = g_file_new_for_path(file_to_send);
   //G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME, G_FILE_ATTRIBUTE_STANDARD_SIZE
   fileInfo = g_file_query_info(file, "standard::display-name,standard::size", G_FILE_QUERY_INFO_NONE, NULL, NULL);
-  do_client_notify(g_strdup_printf("http://%s:%d/?token=%s&size=%jd&name=%s\n",
+  teleport_get_do_client_notify(g_strdup_printf("http://%s:%d/?token=%s&size=%jd&name=%s\n",
                                                 destination,
                                                 port,
                                                 name,