X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=c4de2e8f37d5a94937f0fe3519715d40242f5329;hp=00143799c1c729cfd6fb744a204b46a76e2fee3e;hb=d6a87acd98b9e451d488e31b92cdae7673c30ac6;hpb=42f69f545fad18480d728bb6f25273976a0c01e0

diff --git a/afs.c b/afs.c
index 00143799..c4de2e8f 100644
--- a/afs.c
+++ b/afs.c
@@ -22,8 +22,8 @@
 #include "string.h"
 #include "afh.h"
 #include "afs.h"
-#include "server.h"
 #include "net.h"
+#include "server.h"
 #include "ipc.h"
 #include "list.h"
 #include "sched.h"
@@ -366,8 +366,8 @@ int for_each_matching_row(struct pattern_match_data *pmd)
  */
 int string_compare(const struct osl_object *obj1, const struct osl_object *obj2)
 {
-	const char *str1 = (const char *)obj1->data;
-	const char *str2 = (const char *)obj2->data;
+	const char *str1 = obj1->data;
+	const char *str2 = obj2->data;
 	return strncmp(str1, str2, PARA_MIN(obj1->size, obj2->size));
 }
 
@@ -589,8 +589,9 @@ static int com_select_callback(struct afs_callback_arg *aca)
 	para_printf(&aca->pbout, "activating dummy mood\n");
 	activate_mood_or_playlist(NULL, &num_admissible, NULL);
 out:
-	para_printf(&aca->pbout, "activated %s (%d admissible files)\n",
-		current_mop? current_mop : "dummy mood", num_admissible);
+	para_printf(&aca->pbout, "activated %s (%d admissible file%s)\n",
+		current_mop? current_mop : "dummy mood", num_admissible,
+			num_admissible == 1? "" : "s");
 free_lpr:
 	lls_free_parse_result(aca->lpr, cmd);
 	return ret;
@@ -687,8 +688,7 @@ static int open_afs_tables(void)
 		ret = afs_tables[i].open(database_dir);
 		if (ret >= 0)
 			continue;
-		PARA_ERROR_LOG("%s open: %s\n", afs_tables[i].name,
-			para_strerror(-ret));
+		PARA_ERROR_LOG("could not open %s\n", afs_tables[i].name);
 		break;
 	}
 	if (ret >= 0)
@@ -1043,7 +1043,8 @@ static int com_init_callback(struct afs_callback_arg *aca)
 	}
 	ret = open_afs_tables();
 	if (ret < 0)
-		para_printf(&aca->pbout, "cannot open afs tables\n");
+		para_printf(&aca->pbout, "cannot open afs tables: %s\n",
+			para_strerror(-ret));
 out:
 	return ret;
 }