X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=755537da9e436ab8705222925fa3c737f648eab1;hp=97c3d5694a8dd83fd24c753495bf1411011ae7b9;hb=08d3a77eaeb04981d225a6938404f8ac901407b4;hpb=8c488022fea5ba573534585cb7b123836144c6c2

diff --git a/afs.c b/afs.c
index 97c3d569..755537da 100644
--- a/afs.c
+++ b/afs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -9,7 +9,6 @@
 #include <regex.h>
 #include <signal.h>
 #include <fnmatch.h>
-#include <openssl/rc4.h>
 #include <osl.h>
 
 #include "server.cmdline.h"
@@ -20,9 +19,6 @@
 #include "afh.h"
 #include "afs.h"
 #include "server.h"
-#include <dirent.h> /* readdir() */
-#include <sys/mman.h>
-#include <sys/time.h>
 #include "net.h"
 #include "ipc.h"
 #include "list.h"
@@ -468,7 +464,6 @@ again:
 	}
 	ret = open_and_update_audio_file(aft_row, score, &afd);
 	if (ret < 0) {
-		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 		ret = score_delete(aft_row);
 		if (ret < 0) {
 			PARA_ERROR_LOG("%s\n", para_strerror(-ret));
@@ -582,22 +577,22 @@ out:
  * Result handler for sending data to the para_client process.
  *
  * \param result The data to be sent.
- * \param private Pointer to rc4 context.
+ * \param private Pointer to the context.
  *
- * \return The return value of the underlying call to rc4_send_bin_buffer().
+ * \return The return value of the underlying call to sc_send_bin_buffer().
  *
- * \sa \ref callback_result_handler, \ref rc4_send_bin_buffer().
+ * \sa \ref callback_result_handler, \ref sc_send_bin_buffer().
  */
-int rc4_send_result(struct osl_object *result, void *private)
+int sc_send_result(struct osl_object *result, void *private)
 {
-	struct rc4_context *rc4c = private;
+	struct stream_cipher_context *scc = private;
 
 	if (!result->size)
 		return 1;
-	return rc4_send_bin_buffer(rc4c, result->data, result->size);
+	return sc_send_bin_buffer(scc, result->data, result->size);
 }
 
-int com_select(struct rc4_context *rc4c, int argc, char * const * const argv)
+int com_select(struct stream_cipher_context *scc, int argc, char * const * const argv)
 {
 	struct osl_object query;
 
@@ -606,7 +601,7 @@ int com_select(struct rc4_context *rc4c, int argc, char * const * const argv)
 	query.data = argv[1];
 	query.size = strlen(argv[1]) + 1;
 	return send_callback_request(com_select_callback, &query,
-		&rc4_send_result, rc4c);
+		&sc_send_result, scc);
 }
 
 static void init_admissible_files(char *arg)
@@ -951,7 +946,7 @@ static void register_command_task(uint32_t cookie)
 
 	ct->task.pre_select = command_pre_select;
 	ct->task.post_select = command_post_select;
-	sprintf(ct->task.status, "command task");
+	sprintf(ct->task.status, "afs command task");
 	register_task(&ct->task);
 }
 
@@ -1020,7 +1015,7 @@ out:
 	free(pb.buf);
 }
 
-int com_init(struct rc4_context *rc4c, int argc, char * const * const argv)
+int com_init(struct stream_cipher_context *scc, int argc, char * const * const argv)
 {
 	int i, j, ret;
 	uint32_t table_mask = (1 << (NUM_AFS_TABLES + 1)) - 1;
@@ -1046,9 +1041,9 @@ int com_init(struct rc4_context *rc4c, int argc, char * const * const argv)
 		}
 	}
 	ret = send_callback_request(create_tables_callback, &query,
-		rc4_send_result, rc4c);
+		sc_send_result, scc);
 	if (ret < 0)
-		return rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret));
+		return sc_send_va_buffer(scc, "%s\n", para_strerror(-ret));
 	return ret;
 }
 
@@ -1066,7 +1061,7 @@ enum com_check_flags {
 	CHECK_PLAYLISTS = 4
 };
 
-int com_check(struct rc4_context *rc4c, int argc, char * const * const argv)
+int com_check(struct stream_cipher_context *scc, int argc, char * const * const argv)
 {
 	unsigned flags = 0;
 	int i, ret;
@@ -1099,19 +1094,19 @@ int com_check(struct rc4_context *rc4c, int argc, char * const * const argv)
 		flags = ~0U;
 	if (flags & CHECK_AFT) {
 		ret = send_callback_request(aft_check_callback, NULL,
-			rc4_send_result, rc4c);
+			sc_send_result, scc);
 		if (ret < 0)
 			return ret;
 	}
 	if (flags & CHECK_PLAYLISTS) {
 		ret = send_callback_request(playlist_check_callback,
-			NULL, rc4_send_result, rc4c);
+			NULL, sc_send_result, scc);
 		if (ret < 0)
 			return ret;
 	}
 	if (flags & CHECK_MOODS) {
 		ret = send_callback_request(mood_check_callback, NULL,
-			rc4_send_result, rc4c);
+			sc_send_result, scc);
 		if (ret < 0)
 			return ret;
 	}
@@ -1153,7 +1148,7 @@ void afs_event(enum afs_events event, struct para_buffer *pb,
  *
  * This table does not honor events.
  */
-int images_event_handler(__a_unused enum afs_events event,
+__a_const int images_event_handler(__a_unused enum afs_events event,
 	__a_unused  struct para_buffer *pb, __a_unused void *data)
 {
 	return 1;
@@ -1168,7 +1163,7 @@ int images_event_handler(__a_unused enum afs_events event,
  *
  * This table does not honor events.
  */
-int lyrics_event_handler(__a_unused enum afs_events event,
+__a_const int lyrics_event_handler(__a_unused enum afs_events event,
 	__a_unused struct para_buffer *pb, __a_unused void *data)
 {
 	return 1;