[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=4813030

The following commit has been merged in the master branch:
commit 481303090fbd1ba3c9593edfd9d59e1927fc83a4
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Dec 30 07:30:42 2007 +0000

    Removed unneeded functions which appear to mask Windows native functions. This should fix #514 and probably also #484; to be tested.
---
 src/localtime.c | 338 +++++---------------------------------------------------
 1 file changed, 25 insertions(+), 313 deletions(-)

diff --git a/src/localtime.c b/src/localtime.c
index 55d797d..6bbca8c 100644
--- a/src/localtime.c
+++ b/src/localtime.c
@@ -69,7 +69,10 @@ static char	elsieid[] = "@(#)localtime.c	7.78";
 #define WILDABBR	"   "
 #endif /* !defined WILDABBR */
 
+/* ahu: added conditional */
+#ifdef TM_ZONE
 static char		wildabbr[] = "WILDABBR";
+#endif /* TM_ZONE */
 
 static const char	gmt[] = "GMT";
 
@@ -87,7 +90,7 @@ static const char	gmt[] = "GMT";
 struct ttinfo {				/* time type information */
 	long		tt_gmtoff;	/* UTC offset in seconds */
 	int		tt_isdst;	/* used to set tm_isdst */
-	size_t	tt_abbrind;	/* abbreviation list index */
+	size_t          tt_abbrind;     /* abbreviation list index */
 	int		tt_ttisstd;	/* TRUE if transition is std time */
 	int		tt_ttisgmt;	/* TRUE if transition is UTC */
 };
@@ -135,7 +138,7 @@ struct rule {
 ** Prototypes for static functions.
 */
 
-static long		detzcode P((const char * codep));
+/* ahu: deleted declaration of detzcode */
 static const char *	getzname P((const char * strp));
 static const char *	getnum P((const char * strp, int * nump, int min,
 				int max));
@@ -150,7 +153,7 @@ static void		localsub P((const time_t * timep, long offset,
 static int		increment_overflow P((int * number, int delta));
 static int		normalize_overflow P((int * tensptr, int * unitsptr,
 				int base));
-static void		settzname P((void));
+/* ahu: deleted declaration of settzname */
 static time_t		time1 P((struct tm * tmp,
 				void(*funcp) P((const time_t *,
 				long, struct tm *)),
@@ -189,14 +192,10 @@ static struct state	gmtmem;
 #define TZ_STRLEN_MAX 255
 #endif /* !defined TZ_STRLEN_MAX */
 
-static char		lcl_TZname[TZ_STRLEN_MAX + 1];
-static int		lcl_is_set;
+/* ahu: deleted definition of lcl_TZname[] and lcl_is_set */
 static int		gmt_is_set;
 
-char *			tzname[2] = {
-	wildabbr,
-	wildabbr
-};
+/* ahu: deleted definition of tzname[] */
 
 /*
 ** Section 4.12.3 of X3.159-1989 requires that
@@ -206,7 +205,7 @@ char *			tzname[2] = {
 ** Thanks to Paul Eggert (eggert at twinsun.com) for noting this.
 */
 
-static struct tm	tm;
+/* deleted definition of tm */
 
 #ifdef USG_COMPAT
 time_t			timezone = 0;
@@ -230,55 +229,7 @@ const char * const	codep;
 	return result;
 }
 
-static void
-settzname P((void))
-{
-	register struct state * const	sp = lclptr;
-	register int			i;
-
-	tzname[0] = wildabbr;
-	tzname[1] = wildabbr;
-#ifdef USG_COMPAT
-	daylight = 0;
-	timezone = 0;
-#endif /* defined USG_COMPAT */
-#ifdef ALTZONE
-	altzone = 0;
-#endif /* defined ALTZONE */
-#ifdef ALL_STATE
-	if (sp == NULL) {
-		tzname[0] = tzname[1] = gmt;
-		return;
-	}
-#endif /* defined ALL_STATE */
-	for (i = 0; i < sp->typecnt; ++i) {
-		register const struct ttinfo * const	ttisp = &sp->ttis[i];
-
-		tzname[ttisp->tt_isdst] =
-			&sp->chars[ttisp->tt_abbrind];
-#ifdef USG_COMPAT
-		if (ttisp->tt_isdst)
-			daylight = 1;
-		if (i == 0 || !ttisp->tt_isdst)
-			timezone = -(ttisp->tt_gmtoff);
-#endif /* defined USG_COMPAT */
-#ifdef ALTZONE
-		if (i == 0 || ttisp->tt_isdst)
-			altzone = -(ttisp->tt_gmtoff);
-#endif /* defined ALTZONE */
-	}
-	/*
-	** And to get the latest zone names into tzname. . .
-	*/
-	for (i = 0; i < sp->timecnt; ++i) {
-		register const struct ttinfo * const	ttisp =
-							&sp->ttis[
-								sp->types[i]];
-
-		tzname[ttisp->tt_isdst] =
-			&sp->chars[ttisp->tt_abbrind];
-	}
-}
+/* ahu: deleted definition of settzname */
 
 static int
 tzload(name, sp)
@@ -930,76 +881,9 @@ struct state * const	sp;
 		(void) tzparse(gmt, sp, TRUE);
 }
 
-#ifndef STD_INSPIRED
-/*
-** A non-static declaration of tzsetwall in a system header file
-** may cause a warning about this upcoming static declaration...
-*/
-static
-#endif /* !defined STD_INSPIRED */
-void
-tzsetwall P((void))
-{
-	if (lcl_is_set < 0)
-		return;
-	lcl_is_set = -1;
+/* ahu: deleted definition of tzsetwall */
 
-#ifdef ALL_STATE
-	if (lclptr == NULL) {
-		lclptr = (struct state *) malloc(sizeof *lclptr);
-		if (lclptr == NULL) {
-			settzname();	/* all we can do */
-			return;
-		}
-	}
-#endif /* defined ALL_STATE */
-	if (tzload((char *) NULL, lclptr) != 0)
-		gmtload(lclptr);
-	settzname();
-}
-
-void
-tzset P((void))
-{
-	register const char *	name;
-
-	name = getenv("TZ");
-	if (name == NULL) {
-		tzsetwall();
-		return;
-	}
-
-	if (lcl_is_set > 0 && strcmp(lcl_TZname, name) == 0)
-		return;
-	lcl_is_set = strlen(name) < sizeof lcl_TZname;
-	if (lcl_is_set)
-		(void) strcpy(lcl_TZname, name);
-
-#ifdef ALL_STATE
-	if (lclptr == NULL) {
-		lclptr = (struct state *) malloc(sizeof *lclptr);
-		if (lclptr == NULL) {
-			settzname();	/* all we can do */
-			return;
-		}
-	}
-#endif /* defined ALL_STATE */
-	if (*name == '

-- 
exiv2 packaging