From 048853078b8aefb9a59a7fc981c0c1c259d849cb Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 13 Feb 2010 12:19:43 +0100
Subject: [PATCH] Tweak copyright dates + subroutine name

---
 bacula/src/dird/catreq.c    | 3 +--
 bacula/src/dird/dird_conf.h | 3 +--
 bacula/src/dird/next_vol.c  | 3 +--
 bacula/src/dird/ua_purge.c  | 9 ++++-----
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/bacula/src/dird/catreq.c b/bacula/src/dird/catreq.c
index 9337bf2d11..de2971c269 100644
--- a/bacula/src/dird/catreq.c
+++ b/bacula/src/dird/catreq.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2001-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2001-2010 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -37,7 +37,6 @@
  *  Basic tasks done here:
  *      Handle Catalog services.
  *
- *   Version $Id$
  */
 
 #include "bacula.h"
diff --git a/bacula/src/dird/dird_conf.h b/bacula/src/dird/dird_conf.h
index 60993d41e1..cf82a7ee8a 100644
--- a/bacula/src/dird/dird_conf.h
+++ b/bacula/src/dird/dird_conf.h
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2010 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -30,7 +30,6 @@
  *
  *     Kern Sibbald, Feb MM
  *
- *    Version $Id$
  */
 
 /* NOTE:  #includes at the end of this file */
diff --git a/bacula/src/dird/next_vol.c b/bacula/src/dird/next_vol.c
index 56d6e2017e..f4dc688690 100644
--- a/bacula/src/dird/next_vol.c
+++ b/bacula/src/dird/next_vol.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2001-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2001-2010 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -33,7 +33,6 @@
 
  *     Kern Sibbald, March MMI
  *
- *   Version $Id$
  */
 
 #include "bacula.h"
diff --git a/bacula/src/dird/ua_purge.c b/bacula/src/dird/ua_purge.c
index c78f83a969..1b7fc0f0e1 100644
--- a/bacula/src/dird/ua_purge.c
+++ b/bacula/src/dird/ua_purge.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2002-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2002-2010 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -35,7 +35,6 @@
  *
  *     Kern Sibbald, February MMII
  *
- *   Version $Id$
  */
 
 #include "bacula.h"
@@ -44,7 +43,7 @@
 /* Forward referenced functions */
 static int purge_files_from_client(UAContext *ua, CLIENT *client);
 static int purge_jobs_from_client(UAContext *ua, CLIENT *client);
-static int aop_cmd(UAContext *ua, const char *cmd);
+static int action_on_purge_cmd(UAContext *ua, const char *cmd);
 
 static const char *select_jobsfiles_from_client =
    "SELECT JobId FROM Job "
@@ -141,7 +140,7 @@ int purgecmd(UAContext *ua, const char *cmd)
    case 2:
       /* Perform ActionOnPurge (action=truncate) */
       if (find_arg(ua, "action") >= 0) {
-         return aop_cmd(ua, ua->cmd);
+         return action_on_purge_cmd(ua, ua->cmd);
       }
 
       while ((i=find_arg(ua, NT_("volume"))) >= 0) {
@@ -635,7 +634,7 @@ static void do_truncate_on_purge(UAContext *ua, MEDIA_DBR *mr,
 }
 
 /* purge action= pool= volume= storage= devicetype= */
-static int aop_cmd(UAContext *ua, const char *cmd)
+static int action_on_purge_cmd(UAContext *ua, const char *cmd)
 {
    bool allpools=false;
    int drive=-1;
-- 
2.39.5