kes Fix annoying compiler warnings in console/conio.c

kes  Fix win32 build (depended whether or not ./configure was run).

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8310 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/LICENSE b/bacula/LICENSE
index 1e49d53535d83ee55b7cc11c63ea3095ae4eb3d1..ee20da9b95db9c8dd1b5e1ce3d0ce08da9bb0104 100644 (file)
--- a/bacula/LICENSE
+++ b/bacula/LICENSE
@@ -52,22 +52,22 @@ made to the GPLv2 above, Bacula can be freely linked and distributed
 with the OpenSSL libraries.
 
 Intellectual Property rights:
 with the OpenSSL libraries.
 
 Intellectual Property rights:

-Recipient understands that although each Contributor grants the
-licenses to its Contributions set forth herein, no assurances are
-provided by any Contributor that the Program does not infringe
-the patent or other intellectual property rights of any other
-entity.  Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of
-intellectual property rights or otherwise.  As a condition to
-exercising the rights and licenses granted hereunder, each
-Recipient hereby assumes sole responsibility to secure any other
-intellectual property rights needed, if any.  For example, if a
-third party patent license is required to allow Recipient to
-distribute the Program, it is Recipient's responsibility to
-acquire that license before distributing the Program.
+Recipient understands that although each Contributor to Bacula grants
+the licenses to its Contributions set forth herein, no assurances are
+provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity.
+Each Contributor disclaims any liability to Recipient for claims
+brought by any other entity based on infringement of intellectual
+property rights or otherwise.  As a condition to exercising the rights
+and licenses granted hereunder, each Recipient hereby assumes sole
+responsibility to secure any other intellectual property rights
+needed, if any.  For example, if a third party patent license is
+required to allow Recipient to distribute the Program, it is
+Recipient's responsibility to acquire that license before distributing
+the Program.

 
 Copyrights:
 
 Copyrights:

-Each Contributor represents that to its knowledge it has
+Each Contributor to Bacula represents that to its knowledge it has

 sufficient copyright rights in its Contribution, if any, to grant
 the copyright license set forth in this Agreement.
 
 sufficient copyright rights in its Contribution, if any, to grant
 the copyright license set forth in this Agreement.
 


@@ -75,7 +75,7 @@ Code falling under the above conditions will be marked as follows:
 
    Bacula® - The Network Backup Solution
 
 
    Bacula® - The Network Backup Solution
 

-   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2009 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.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.

diff --git a/bacula/src/console/conio.c b/bacula/src/console/conio.c
index cf695716d3ad7c832fde0c3250a8a4f2ee19d1d2..157df55e7c35aa46e0e67010223fb3bb3dea5aba 100755 (executable)
--- a/bacula/src/console/conio.c
+++ b/bacula/src/console/conio.c
@@ -996,39 +996,40 @@ static void rawmode(FILE *input)
       exit(1);
    }
    t_width = t_height = -1;
       exit(1);
    }
    t_width = t_height = -1;

-   t_width = tgetnum("co") - 1;
-   t_height = tgetnum("li");
+   /* Note (char *)casting is due to really stupid compiler warnings */
+   t_width = tgetnum((char *)"co") - 1;
+   t_height = tgetnum((char *)"li");

    BC = NULL;
    UP = NULL;
    BC = NULL;
    UP = NULL;

-   t_cm = (char *)tgetstr("cm", &term_buffer);
-   t_cs = (char *)tgetstr("cl", &term_buffer); /* clear screen */
-   t_cl = (char *)tgetstr("ce", &term_buffer); /* clear line */
-   t_dl = (char *)tgetstr("dl", &term_buffer); /* delete line */
-   t_il = (char *)tgetstr("al", &term_buffer); /* insert line */
-   t_honk = (char *)tgetstr("bl", &term_buffer); /* beep */
-   t_ti = (char *)tgetstr("ti", &term_buffer);
-   t_te = (char *)tgetstr("te", &term_buffer);
-   t_up = (char *)tgetstr("up", &term_buffer);
-   t_do = (char *)tgetstr("do", &term_buffer);
-   t_sf = (char *)tgetstr("sf", &term_buffer);
+   t_cm = (char *)tgetstr((char *)"cm", &term_buffer);
+   t_cs = (char *)tgetstr((char *)"cl", &term_buffer); /* clear screen */
+   t_cl = (char *)tgetstr((char *)"ce", &term_buffer); /* clear line */
+   t_dl = (char *)tgetstr((char *)"dl", &term_buffer); /* delete line */
+   t_il = (char *)tgetstr((char *)"al", &term_buffer); /* insert line */
+   t_honk = (char *)tgetstr((char *)"bl", &term_buffer); /* beep */
+   t_ti = (char *)tgetstr((char *)"ti", &term_buffer);
+   t_te = (char *)tgetstr((char *)"te", &term_buffer);
+   t_up = (char *)tgetstr((char *)"up", &term_buffer);
+   t_do = (char *)tgetstr((char *)"do", &term_buffer);
+   t_sf = (char *)tgetstr((char *)"sf", &term_buffer);

 
    num_stab = MAX_STAB;                  /* get default stab size */
    stab = (stab_t **)malloc(sizeof(stab_t *) * num_stab);
    memset(stab, 0, sizeof(stab_t *) * num_stab);
 
    /* Key bindings */
 
    num_stab = MAX_STAB;                  /* get default stab size */
    stab = (stab_t **)malloc(sizeof(stab_t *) * num_stab);
    memset(stab, 0, sizeof(stab_t *) * num_stab);
 
    /* Key bindings */

-   kl = (char *)tgetstr("kl", &term_buffer);
-   kr = (char *)tgetstr("kr", &term_buffer);
-   ku = (char *)tgetstr("ku", &term_buffer);
-   kd = (char *)tgetstr("kd", &term_buffer);
-   kh = (char *)tgetstr("kh", &term_buffer);
-   kb = (char *)tgetstr("kb", &term_buffer);
-   kD = (char *)tgetstr("kD", &term_buffer);
-   kI = (char *)tgetstr("kI", &term_buffer);
-   kN = (char *)tgetstr("kN", &term_buffer);
-   kP = (char *)tgetstr("kP", &term_buffer);
-   kH = (char *)tgetstr("kH", &term_buffer);
-   kE = (char *)tgetstr("kE", &term_buffer);
+   kl = (char *)tgetstr((char *)"kl", &term_buffer);
+   kr = (char *)tgetstr((char *)"kr", &term_buffer);
+   ku = (char *)tgetstr((char *)"ku", &term_buffer);
+   kd = (char *)tgetstr((char *)"kd", &term_buffer);
+   kh = (char *)tgetstr((char *)"kh", &term_buffer);
+   kb = (char *)tgetstr((char *)"kb", &term_buffer);
+   kD = (char *)tgetstr((char *)"kD", &term_buffer);
+   kI = (char *)tgetstr((char *)"kI", &term_buffer);
+   kN = (char *)tgetstr((char *)"kN", &term_buffer);
+   kP = (char *)tgetstr((char *)"kP", &term_buffer);
+   kH = (char *)tgetstr((char *)"kH", &term_buffer);
+   kE = (char *)tgetstr((char *)"kE", &term_buffer);

 
    add_smap(kl, F_CSRLFT);
    add_smap(kr, F_CSRRGT);
 
    add_smap(kl, F_CSRLFT);
    add_smap(kr, F_CSRRGT);

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 4960494739670061ebc2cf57e207a22008b6fd66..f92c69c81d7788c49f01fc929163d77e429024db 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,16 +4,16 @@
 
 #undef  VERSION
 #define VERSION "2.5.28"
 
 #undef  VERSION
 #define VERSION "2.5.28"

-#define BDATE   "26 December 2008"
-#define LSMDATE "26Dec08"
+#define BDATE   "04 January 2009"
+#define LSMDATE "04Jan09"

 
 #define PROG_COPYRIGHT "Copyright (C) %d-2008 Free Software Foundation Europe e.V.\n"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2008 Free Software Foundation Europe e.V.\n"

-#define BYEAR "2008"       /* year for copyright messages in progs */
+#define BYEAR "2009"       /* year for copyright messages in progs */

 
 /*
    Bacula® - The Network Backup Solution
 
 
 /*
    Bacula® - The Network Backup Solution
 

-   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2009 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.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.

diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index 2dd3e70ecfbf9d3d553bb85f3cb18b671355b1bd..c25e6d3dea2d6051662724a163e06b18600a25d3 100644 (file)
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -10,6 +10,9 @@ filepattern (restore with regex in bsr)
 mixed priorities
 
 General:
 mixed priorities
 
 General:

+02Jan09
+kes  Fix annoying compiler warnings in console/conio.c
+kes  Fix win32 build (depended whether or not ./configure was run).

 28Dec08
 kes  Apply fix suggested by Bruno Friedmann to configure.in to
      find python2.5
 28Dec08
 kes  Apply fix suggested by Bruno Friedmann to configure.in to
      find python2.5