libxslt r1489 - in trunk: . libexslt libxslt

[wbrack svn gnome org]

Author: wbrack
Date: Wed Aug  6 12:12:05 2008
New Revision: 1489
URL: http://svn.gnome.org/viewvc/libxslt?rev=1489&view=rev

Log:
* Minor cleanup of "typo" and some compilation warnings:
  tests/namespaces/tst7.xsl: fixed typo detected by new libxml2 code
  libxslt/keys.c, libxslt/xsltlocale.c, libexslt/date.c: trivial
  changes for gcc warnings.

Modified:
   trunk/ChangeLog
   trunk/libexslt/date.c
   trunk/libxslt/keys.c
   trunk/libxslt/xsltlocale.c

Modified: trunk/libexslt/date.c
==============================================================================
--- trunk/libexslt/date.c	(original)
+++ trunk/libexslt/date.c	Wed Aug  6 12:12:05 2008
@@ -747,7 +747,7 @@
 exsltDateCurrent (void)
 {
     struct tm localTm, gmTm;
-    time_t secs, gsecs;
+    time_t secs;
     int local_s, gm_s;
     exsltDateValPtr ret;
 
@@ -2176,7 +2176,7 @@
 	year = dt->value.date.year - 1;
 	if(year == 0) year--;
 	diy = DAY_IN_YEAR(31, 12, year) + diy;
-    } else if (diy > DAY_IN_YEAR(31, 12, dt->value.date.year)) {
+    } else if (diy > (long)DAY_IN_YEAR(31, 12, dt->value.date.year)) {
 	diy -= DAY_IN_YEAR(31, 12, dt->value.date.year);
     }
 

Modified: trunk/libxslt/keys.c
==============================================================================
--- trunk/libxslt/keys.c	(original)
+++ trunk/libxslt/keys.c	Wed Aug  6 12:12:05 2008
@@ -474,7 +474,7 @@
                     const xmlChar *nameURI)
 {
     xsltStylesheetPtr style;
-    xsltKeyDefPtr keyd;
+    xsltKeyDefPtr keyd = NULL;
     int found = 0;
 
 #ifdef KEY_INIT_DEBUG
@@ -504,7 +504,7 @@
 	XSLT_TRACE(ctxt,XSLT_TRACE_KEYS,xsltGenericDebug(xsltGenericDebugContext,
 	     "xsltInitDocKeyTable: did not found %s\n", name));
 #endif
-	xsltTransformError(ctxt, NULL, keyd->inst,
+	xsltTransformError(ctxt, NULL, keyd? keyd->inst : NULL,
 	    "Failed to find key definition for %s\n", name);
 	ctxt->state = XSLT_STATE_STOPPED;
         return(-1);

Modified: trunk/libxslt/xsltlocale.c
==============================================================================
--- trunk/libxslt/xsltlocale.c	(original)
+++ trunk/libxslt/xsltlocale.c	Wed Aug  6 12:12:05 2008
@@ -84,7 +84,7 @@
     const xmlChar *p = languageTag;
     const char *region = NULL;
     char *q = localeName;
-    int c, i, llen;
+    int i, llen;
     
     /* Convert something like "pt-br" to "pt_BR.utf8" */
     
@@ -123,7 +123,7 @@
     if (llen != 2)
         return(NULL);
 
-    region = xsltDefaultRegion(localeName);
+    region = (char *)xsltDefaultRegion((xmlChar *)localeName);
     if (region == NULL)
         return(NULL);
      
@@ -184,7 +184,8 @@
 static const xmlChar*
 xsltDefaultRegion(const xmlChar *localeName) {
     xmlChar c;
-    const xmlChar *region = NULL;
+    /* region should be xmlChar, but gcc warns on all string assignments */
+    const char *region = NULL;
     
     c = localeName[1];
     /* This is based on the locales from glibc 2.3.3 */
@@ -315,7 +316,7 @@
             else if (c == 'u') region = "ZA";
             break;
     }
-    return(region);
+    return((xmlChar *)region);
 }
 
 /**