projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into next
[paraslash.git]
/
playlist.c
diff --git
a/playlist.c
b/playlist.c
index 7a912bade5f3890796d2c1a7a672757bee12fcb8..852ffd7a9724471798a6f6a376a2826c0f6961f5 100644
(file)
--- a/
playlist.c
+++ b/
playlist.c
@@
-1,9
+1,12
@@
/*
/*
- * Copyright (C) 2007-200
8
Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-200
9
Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* 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"
#include "para.h"
#include "error.h"
#include "string.h"
@@
-120,8
+123,8
@@
static int check_playlist(struct osl_row *row, void *data)
/**
* Check the playlist table for inconsistencies.
*
/**
* Check the playlist table for inconsistencies.
*
+ * \param fd The afs socket.
* \param query Unused.
* \param query Unused.
- * \param result Contains messages about inconsistencies.
*
* \return The return value of the underlying call to osl_rbtree_loop().
*/
*
* \return The return value of the underlying call to osl_rbtree_loop().
*/
@@
-174,7
+177,7
@@
int playlist_open(char *name)
obj.data = name;
obj.size = strlen(obj.data);
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;
if (ret < 0) {
PARA_NOTICE_LOG("failed to load playlist %s\n", name);
return ret;