Strip pathname portion off all message routines that print filename:line.

[bacula/bacula] / bacula / src / lib / workq.h

diff --git a/bacula/src/lib/workq.h b/bacula/src/lib/workq.h
index 64ef4834f316403c7828ba9babfa82a7c32c33f1..7e5fab5429c48762010679d230880a050eb66391 100644 (file)
--- a/bacula/src/lib/workq.h
+++ b/bacula/src/lib/workq.h
@@ -10,29 +10,24 @@
  *   Version $Id$
  */
 /*
-   Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2001-2006 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   modify it under the terms of the GNU General Public License
+   version 2 as amended with additional clauses defined in the
+   file LICENSE in the main source directory.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+   the file LICENSE for additional details.
 
  */
 
-#ifndef __WORKQ_H 
+#ifndef __WORKQ_H
 #define __WORKQ_H 1
 
-/* 
+/*
  * Structure to keep track of work queue request
  */
 typedef struct workq_ele_tag {
@@ -40,7 +35,7 @@ typedef struct workq_ele_tag {
    void                 *data;
 } workq_ele_t;
 
-/* 
+/*
  * Structure describing a work queue
  */
 typedef struct workq_tag {
@@ -53,7 +48,7 @@ typedef struct workq_tag {
    int               max_workers;     /* max threads */
    int               num_workers;     /* current threads */
    int               idle_workers;    /* idle threads */
-   void              (*engine)(void *arg); /* user engine */
+   void             *(*engine)(void *arg); /* user engine */
 } workq_t;
 
 #define WORKQ_VALID  0xdec1992
@@ -61,7 +56,7 @@ typedef struct workq_tag {
 extern int workq_init(
               workq_t *wq,
               int     threads,        /* maximum threads */
-              void    (*engine)(void *)   /* engine routine */
+              void   *(*engine)(void *)   /* engine routine */
                     );
 extern int workq_destroy(workq_t *wq);
 extern int workq_add(workq_t *wq, void *element, workq_ele_t **work_item, int priority);