X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=39e94a945e0b9b8c47d29e6bb59d799491f2f9e4;hp=daa9a500a7712d01731fcadb577f509060768ea4;hb=a4eb244ecdf9aaa0f167b3c91d3e276bde99d681;hpb=299df142bb50bacebc0b3050768f941bc95b5b6f

diff --git a/aft.c b/aft.c
index daa9a500..39e94a94 100644
--- a/aft.c
+++ b/aft.c
@@ -6,18 +6,18 @@
 
 /** \file aft.c Audio file table functions. */
 
+#include <regex.h>
 #include <dirent.h> /* readdir() */
 #include <openssl/rc4.h>
-
+#include <sys/mman.h>
+#include <fnmatch.h>
+#include <sys/shm.h>
 #include <osl.h>
+
 #include "para.h"
 #include "error.h"
 #include "crypt.h"
 #include "string.h"
-#include <sys/mman.h>
-#include <fnmatch.h>
-#include <sys/shm.h>
-
 #include "afh.h"
 #include "afs.h"
 #include "net.h"
@@ -238,7 +238,7 @@ enum audio_file_table_columns {
  *
  * \sa osl_compare_func, uint32_compare().
  */
-int aft_hash_compare(const struct osl_object *obj1, const struct osl_object *obj2)
+static int aft_hash_compare(const struct osl_object *obj1, const struct osl_object *obj2)
 {
 	return hash_compare((HASH_TYPE *)obj1->data, (HASH_TYPE *)obj2->data);
 }
@@ -475,7 +475,7 @@ int aft_get_row_of_path(const char *path, struct osl_row **row)
  *
  * \return Standard.
  */
-int aft_get_row_of_hash(HASH_TYPE *hash, struct osl_row **row)
+static int aft_get_row_of_hash(HASH_TYPE *hash, struct osl_row **row)
 {
 	const struct osl_object obj = {.data = hash, .size = HASH_SIZE};
 	return osl(osl_get_row(audio_file_table, AFTCOL_HASH, &obj, row));
@@ -503,7 +503,7 @@ int get_afsi_object_of_row(const struct osl_row *row, struct osl_object *obj)
  *
  * \return Positive on success, negative on errors.
  */
-int get_afsi_object_of_path(const char *path, struct osl_object *obj)
+static int get_afsi_object_of_path(const char *path, struct osl_object *obj)
 {
 	struct osl_row *row;
 	int ret = aft_get_row_of_path(path, &row);
@@ -2105,33 +2105,33 @@ int com_touch(struct rc4_context *rc4c, int argc, char * const * const argv)
 			i++;
 			break;
 		}
-		if (!strncmp(arg, "-n", 2)) {
-			ret = para_atoi32(arg + 2, &cto.num_played);
+		if (!strncmp(arg, "-n=", 3)) {
+			ret = para_atoi32(arg + 3, &cto.num_played);
 			if (ret < 0)
 				return ret;
 			continue;
 		}
-		if (!strncmp(arg, "-l", 2)) {
-			ret = para_atoi64(arg + 2, &cto.last_played);
+		if (!strncmp(arg, "-l=", 3)) {
+			ret = para_atoi64(arg + 3, &cto.last_played);
 			if (ret < 0)
 				return ret;
 			continue;
 		}
-		if (!strncmp(arg, "-y", 2)) {
-			ret = para_atoi32(arg + 2, &cto.lyrics_id);
+		if (!strncmp(arg, "-y=", 3)) {
+			ret = para_atoi32(arg + 3, &cto.lyrics_id);
 			if (ret < 0)
 				return ret;
 			continue;
 		}
-		if (!strncmp(arg, "-i", 2)) {
-			ret = para_atoi32(arg + 2, &cto.image_id);
+		if (!strncmp(arg, "-i=", 3)) {
+			ret = para_atoi32(arg + 3, &cto.image_id);
 			if (ret < 0)
 				return ret;
 			continue;
 		}
-		if (!strncmp(arg, "-a", 2)) {
+		if (!strncmp(arg, "-a=", 3)) {
 			int32_t val;
-			ret = para_atoi32(arg + 2, &val);
+			ret = para_atoi32(arg + 3, &val);
 			if (ret < 0)
 				return ret;
 			if (val < 0 || val > 255)
@@ -2435,7 +2435,7 @@ int com_cpsi(struct rc4_context *rc4c, int argc,  char * const * const argv)
 	return ret;
 }
 
-void afs_stat_callback(int fd, const struct osl_object *query)
+static void afs_stat_callback(int fd, const struct osl_object *query)
 {
 	int *parser_friendly = query->data;
 	char *buf = *parser_friendly?
@@ -2612,7 +2612,6 @@ static int aft_event_handler(enum afs_events event, struct para_buffer *pb,
 
 void aft_init(struct afs_table *t)
 {
-	t->name = audio_file_table_desc.name;
 	t->open = aft_open;
 	t->close = aft_close;
 	t->create = aft_create;