Change year in copyright message to 2012.

[paraslash.git] / afs.h

diff --git a/afs.h b/afs.h
index 7a93183e40ec4795ca60ed95a412956109f49a68..7145c41b9ee71d10ad1fcaeb492532176dfcc25a 100644 (file)
--- a/afs.h
+++ b/afs.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2007-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2012 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.
  */


@@ -7,7 +7,6 @@
 /** \file afs.h Exported symbols of the audio file selector. */
 
 #include <regex.h>
 /** \file afs.h Exported symbols of the audio file selector. */
 
 #include <regex.h>

-#include "hash.h"

 
 /** Audio file selector data stored in the audio file table. */
 struct afs_info {
 
 /** Audio file selector data stored in the audio file table. */
 struct afs_info {


@@ -119,8 +118,8 @@ struct ls_data {
        char *path;
        /** The score value (if -a was given). */
        long score;
        char *path;
        /** The score value (if -a was given). */
        long score;

-       /** The sha1 hash of audio file. */
-       HASH_TYPE *hash;
+       /** The hash value of audio file data. */
+       unsigned char *hash;

 };
 
 /** Data about the current audio file, passed from afs to server. */
 };
 
 /** Data about the current audio file, passed from afs to server. */


@@ -182,6 +181,8 @@ struct pattern_match_data {
        struct osl_object patterns;
        /** Data pointer passed to the action function. */
        void *data;
        struct osl_object patterns;
        /** Data pointer passed to the action function. */
        void *data;

+       /** Gets increased by one for each match. */
+       unsigned num_matches;

        /** For each matching row, this function will be called. */
        int (*action)(struct osl_table *table, struct osl_row *row, const char *name, void *data);
 };
        /** For each matching row, this function will be called. */
        int (*action)(struct osl_table *table, struct osl_row *row, const char *name, void *data);
 };