aft: Reorder global static variables of aft.c.

These variables constitute the state of the audio file table. The
overall logic is easier to understand if they are combined at one
spot at the top of the file.

The definition of struct ls_data needs to be moved up because of
this. Pure code movement, no semantic changes.

diff --git a/aft.c b/aft.c
index c0605e6b3d3380c3f08c78ab676b1d846a00597d..8969e7ac207ac935a83e4a212ee07d09e7317bc1 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -22,9 +22,30 @@
 #include "sideband.h"
 #include "command.h"
 
 #include "sideband.h"
 #include "command.h"
 

-static struct osl_table *audio_file_table;
+/* Data about one audio file. Needed for ls and stat output. */
+struct ls_data {
+       /* Usual audio format handler information. */
+       struct afh_info afhi;
+       /* Audio file selector information. */
+       struct afs_info afsi;
+       /* The full path of the audio file. */
+       char *path;
+       /* The score value (if -a was given). */
+       long score;
+       /* The hash value of the audio file data. */
+       unsigned char *hash;
+};
+
+/*
+ * The internal state of the audio file table is described by the following
+ * variables which are private to aft.c.
+ */
+static struct osl_table *audio_file_table; /* NULL if table not open */
+static struct osl_row *current_aft_row; /* NULL if no audio file open */
+

 static char *status_items;
 static char *parser_friendly_status_items;
 static char *status_items;
 static char *parser_friendly_status_items;

+static struct ls_data status_item_ls_data;

 
 /** The different sorting methods of the ls command. */
 enum ls_sorting_method {
 
 /** The different sorting methods of the ls command. */
 enum ls_sorting_method {


@@ -70,20 +91,6 @@ enum ls_listing_mode {
        LS_MODE_PARSER,
 };
 
        LS_MODE_PARSER,
 };
 

-/* Data about one audio file. Needed for ls and stat output. */
-struct ls_data {
-       /* Usual audio format handler information. */
-       struct afh_info afhi;
-       /* Audio file selector information. */
-       struct afs_info afsi;
-       /* The full path of the audio file. */
-       char *path;
-       /* The score value (if -a was given). */
-       long score;
-       /* The hash value of the audio file data. */
-       unsigned char *hash;
-};
-

 /**
  * The size of the individual output fields of the ls command.
  *
 /**
  * The size of the individual output fields of the ls command.
  *


@@ -954,9 +961,6 @@ out:
        return ret;
 }
 
        return ret;
 }
 

-static struct ls_data status_item_ls_data;
-static struct osl_row *current_aft_row;
-

 static void make_inode_status_items(struct para_buffer *pb)
 {
        struct stat statbuf = {.st_size = 0};
 static void make_inode_status_items(struct para_buffer *pb)
 {
        struct stat statbuf = {.st_size = 0};