X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=b40fe8e05c943eb503b3a2344fc1287db81b3696;hp=c89e3cec68ce835d44b803ce1fc144948ab9d8e1;hb=c00d7e25de7006d6f88aafb2b485057377a70324;hpb=732bf143e456df7fc2e845884fbbdfdaf3fafebc

diff --git a/afs.c b/afs.c
index c89e3cec..b40fe8e0 100644
--- a/afs.c
+++ b/afs.c
@@ -9,6 +9,7 @@
 #include <signal.h>
 #include <fnmatch.h>
 #include <openssl/rc4.h>
+#include <osl.h>
 
 #include "server.cmdline.h"
 #include "para.h"
@@ -88,7 +89,6 @@ static struct signal_task signal_task_struct;
 static enum play_mode current_play_mode;
 static char *current_mop; /* mode or playlist specifier. NULL means dummy mooe */
 
-
 /**
  * A random number used to "authenticate" the connection.
  *
@@ -345,7 +345,7 @@ static int action_if_pattern_matches(struct osl_row *row, void *data)
 	struct pattern_match_data *pmd = data;
 	struct osl_object name_obj;
 	const char *p, *name;
-	int ret = osl_get_object(pmd->table, row, pmd->match_col_num, &name_obj);
+	int ret = osl(osl_get_object(pmd->table, row, pmd->match_col_num, &name_obj));
 	const char *pattern_txt = (const char *)pmd->patterns.data;
 
 	if (ret < 0)
@@ -372,16 +372,15 @@ static int action_if_pattern_matches(struct osl_row *row, void *data)
  *
  * \param pmd Describes what to match and how.
  *
- * \return The return value of the underlying call to osl_rbtree_loop()
- * or osl_rbtree_loop_reverse().
+ * \return Standard.
  */
 int for_each_matching_row(struct pattern_match_data *pmd)
 {
 	if (pmd->pm_flags & PM_REVERSE_LOOP)
-		return osl_rbtree_loop_reverse(pmd->table, pmd->loop_col_num, pmd,
-			action_if_pattern_matches);
-	return osl_rbtree_loop(pmd->table, pmd->loop_col_num, pmd,
-			action_if_pattern_matches);
+		return osl(osl_rbtree_loop_reverse(pmd->table, pmd->loop_col_num, pmd,
+			action_if_pattern_matches));
+	return osl(osl_rbtree_loop(pmd->table, pmd->loop_col_num, pmd,
+			action_if_pattern_matches));
 }
 
 /**
@@ -660,7 +659,7 @@ static void get_database_dir(void)
 		else {
 			char *home = para_homedir();
 			database_dir = make_message(
-				"%s/.paraslash/afs_database", home);
+				"%s/.paraslash/afs_database-0.4", home);
 			free(home);
 		}
 	}