From: Kern Sibbald Date: Sun, 4 Jan 2009 11:59:53 +0000 (+0000) Subject: kes Fix annoying compiler warnings in console/conio.c X-Git-Tag: Release-3.0.0~357 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9a953ce08d9368f6605f2d2c5963912777158c05;p=bacula%2Fbacula 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 1e49d53535..ee20da9b95 100644 --- 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: -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: -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. @@ -75,7 +75,7 @@ Code falling under the above conditions will be marked as follows: 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. diff --git a/bacula/src/console/conio.c b/bacula/src/console/conio.c index cf695716d3..157df55e7c 100755 --- 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; - 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; - 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 */ - 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); diff --git a/bacula/src/version.h b/bacula/src/version.h index 4960494739..f92c69c81d 100644 --- a/bacula/src/version.h +++ b/bacula/src/version.h @@ -4,16 +4,16 @@ #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 BYEAR "2008" /* year for copyright messages in progs */ +#define BYEAR "2009" /* year for copyright messages in progs */ /* 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. diff --git a/bacula/src/win32/Makefile b/bacula/src/win32/Makefile index 1762c8f895..cf91859bb2 100644 --- a/bacula/src/win32/Makefile +++ b/bacula/src/win32/Makefile @@ -1,4 +1,4 @@ -c+ECHO_CMD=@ +ECHO_CMD=@ DIRS= dll \ cats \ @@ -12,7 +12,7 @@ DIRS= dll \ scripts \ installer -.PHONY: $(DIRS) clean all +.PHONY: $(DIRS) clean all Makefile.inc all: Makefile.inc $(DIRS) @@ -28,7 +28,7 @@ $(DIRS): fi ; \ fi -Makefile.inc: Makefile.inc.in Makefile +Makefile.inc: @echo Creating $@ $(ECHO_CMD)TOPDIR=`(cd ../../..;pwd)`; \ if test -e ../../../cross-tools/mingw32/bin/mingw32-gcc; then \ @@ -44,8 +44,8 @@ Makefile.inc: Makefile.inc.in Makefile echo "You must run build-win32-cross-tools and build-dependencies first.\n"; \ exit 1; \ fi ; \ - $(ECHO_CMD)BUILDDIR=`(pwd)`; \ - $(ECHO_CMD)MAINDIR=`(cd ../..;pwd)`; \ + BUILDDIR=`(pwd)`; \ + MAINDIR=`(cd ../..;pwd)`; \ sed \ -e "s^@WIN32BUILDDIR@^$${BUILDDIR}^" \ -e "s^@WIN32MAINDIR@^$${MAINDIR}^" \ diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5 index 2dd3e70ecf..c25e6d3dea 100644 --- a/bacula/technotes-2.5 +++ b/bacula/technotes-2.5 @@ -10,6 +10,9 @@ filepattern (restore with regex in bsr) 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