X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=playlist.c;h=13c2940428fb6720b32e4653207d5df0554c41f0;hp=7a912bade5f3890796d2c1a7a672757bee12fcb8;hb=d0d27cfa56d05eaa0e5567c75adfe606eab2957e;hpb=49bd626084bf5f48e4d80075258b6da4703752cf

diff --git a/playlist.c b/playlist.c
index 7a912bad..13c29404 100644
--- a/playlist.c
+++ b/playlist.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2007-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
+#include <regex.h>
+#include <osl.h>
+
 #include "para.h"
 #include "error.h"
 #include "string.h"
@@ -120,15 +123,15 @@ static int check_playlist(struct osl_row *row, void *data)
 /**
  * Check the playlist table for inconsistencies.
  *
+ * \param fd The afs socket.
  * \param query Unused.
- * \param result Contains messages about inconsistencies.
  *
  * \return The return value of the underlying call to osl_rbtree_loop().
  */
 void playlist_check_callback(int fd, __a_unused const struct osl_object *query)
 {
 	struct para_buffer pb = {
-		.max_size = SHMMAX,
+		.max_size = shm_get_shmmax(),
 		.private_data = &fd,
 		.max_size_handler = pass_buffer_as_shm
 	};
@@ -174,7 +177,7 @@ int playlist_open(char *name)
 
 	obj.data = name;
 	obj.size = strlen(obj.data);
-	ret = osl_get_row(playlists_table, BLOBCOL_NAME, &obj, &row);
+	ret = osl(osl_get_row(playlists_table, BLOBCOL_NAME, &obj, &row));
 	if (ret < 0) {
 		PARA_NOTICE_LOG("failed to load playlist %s\n", name);
 		return ret;