Changeset 9796

Timestamp:

Dec 18, 2009, 5:56:41 AM (12 years ago)

Author:

charles

Message:

(trunk gtk) make check_filenames() a private function

Location:

trunk/gtk

Files:

• main.c (modified) (1 diff)
• util.c (modified) (1 diff)
• util.h (modified) (1 diff)

trunk/gtk/main.c

@@ -443 +443 @@
 }
 
+static GSList *
+checkfilenames( int argc, char **argv )
+{
+    int i;
+    GSList * ret = NULL;
+    char * pwd = g_get_current_dir( );
+
+    for( i=0; i<argc; ++i )
+    {
+        if( gtr_is_supported_url( argv[i] ) || gtr_is_magnet_link( argv[i] ) )
+        {
+            ret = g_slist_prepend( ret, g_strdup( argv[i] ) );
+        }
+        else /* local file */
+        {
+            char * filename = g_path_is_absolute( argv[i] )
+                            ? g_strdup ( argv[i] )
+                            : g_build_filename( pwd, argv[i], NULL );
+
+            if( g_file_test( filename, G_FILE_TEST_EXISTS ) )
+                ret = g_slist_prepend( ret, filename );
+            else {
+                if( gtr_is_hex_hashcode( argv[i] ) )
+                    ret = g_slist_prepend( ret, g_strdup_printf( "magnet:?xt=urn:btih:%s", argv[i] ) );
+                g_free( filename );
+            }
+        }
+    }
+
+    g_free( pwd );
+    return g_slist_reverse( ret );
+}
+
 int
 main( int argc, char ** argv )

trunk/gtk/util.c

@@ -351 +351 @@
 
     return TRUE;
-}
-
-GSList *
-checkfilenames( int argc, char **argv )
-{
-    int i;
-    GSList * ret = NULL;
-    char * pwd = g_get_current_dir( );
-
-    for( i=0; i<argc; ++i )
-    {
-        if( gtr_is_supported_url( argv[i] ) || gtr_is_magnet_link( argv[i] ) )
-        {
-            ret = g_slist_prepend( ret, g_strdup( argv[i] ) );
-        }
-        else /* local file */
-        {
-            char * filename = g_path_is_absolute( argv[i] )
-                            ? g_strdup ( argv[i] )
-                            : g_build_filename( pwd, argv[i], NULL );
-
-            if( g_file_test( filename, G_FILE_TEST_EXISTS ) )
-                ret = g_slist_prepend( ret, filename );
-            else {
-                if( gtr_is_hex_hashcode( argv[i] ) )
-                    ret = g_slist_prepend( ret, g_strdup_printf( "magnet:?xt=urn:btih:%s", argv[i] ) );
-                g_free( filename );
-            }
-        }
-    }
-
-    g_free( pwd );
-    return g_slist_reverse( ret );
 }
 

trunk/gtk/util.h

@@ -62 +62 @@
 /* decodes a string that has been urlencoded */
 char * decode_uri( const char * uri );
-
-/* return a list of cleaned-up paths, with invalid directories removed */
-GSList * checkfilenames( int argc, char ** argv );
 
 /***