textlayout: declare variables when they are used

Fixes various -Wunused warnings.

Author: MaxKellermann

mapogcfilter.c

@@ -2176,10 +2176,6 @@ const char* FLTGetDuring(FilterEncodingNode *psFilterNode, const char** ppszTime
 char *FLTGetSQLExpression(FilterEncodingNode *psFilterNode, layerObj *lp)
 {
   char *pszExpression = NULL;
-  const char *pszAttribute = NULL;
-  char szTmp[256];
-  char **tokens = NULL;
-  int nTokens = 0, i=0, bString=0;
 
   if (psFilterNode == NULL || lp == NULL)
     return NULL;
@@ -2218,12 +2214,13 @@ char *FLTGetSQLExpression(FilterEncodingNode *psFilterNode, layerObj *lp)
   } else if (psFilterNode->eType == FILTER_NODE_TYPE_FEATUREID) {
 #if defined(USE_WMS_SVR) || defined (USE_WFS_SVR) || defined (USE_WCS_SVR) || defined(USE_SOS_SVR)
     if (psFilterNode->pszValue) {
-      pszAttribute = msOWSLookupMetadata(&(lp->metadata), "OFG", "featureid");
+      const char *pszAttribute = msOWSLookupMetadata(&(lp->metadata), "OFG", "featureid");
       if (pszAttribute) {
-        tokens = msStringSplit(psFilterNode->pszValue,',', &nTokens);
-        bString = 0;
+        int nTokens = 0;
+        char **tokens = msStringSplit(psFilterNode->pszValue,',', &nTokens);
+        int bString = 0;
         if (tokens && nTokens > 0) {
-          for (i=0; i<nTokens; i++) {
+          for (int i=0; i<nTokens; i++) {
             char *pszEscapedStr = NULL;
             const char* pszId = tokens[i];
             const char* pszDot = strchr(pszId, '.');
@@ -2237,6 +2234,7 @@ char *FLTGetSQLExpression(FilterEncodingNode *psFilterNode, layerObj *lp)
               bString = 1;
 
             pszEscapedStr = msLayerEscapeSQLParam(lp, pszId);
+            char szTmp[256];
             if (bString)
             {
               if( lp->connectiontype == MS_OGR || lp->connectiontype == MS_POSTGIS )
@@ -3128,19 +3126,14 @@ static void FLTRemoveGroupName(FilterEncodingNode *psFilterNode,
 void FLTPreParseFilterForAliasAndGroup(FilterEncodingNode *psFilterNode,
                                mapObj *map, int i, const char *namespaces)
 {
-  layerObj *lp=NULL;
-  char szTmp[256];
-  const char *pszFullName = NULL;
-  int layerWasOpened =  MS_FALSE;
-
 #if defined(USE_WMS_SVR) || defined (USE_WFS_SVR) || defined (USE_WCS_SVR) || defined(USE_SOS_SVR)
 
   if (psFilterNode && map && i>=0 && i<map->numlayers) {
     /*strip name spaces before hand*/
     FLTStripNameSpacesFromPropertyName(psFilterNode);
 
-    lp = GET_LAYER(map, i);
-    layerWasOpened = msLayerIsOpen(lp);
+    layerObj *lp = GET_LAYER(map, i);
+    int layerWasOpened = msLayerIsOpen(lp);
     if (msLayerOpen(lp) == MS_SUCCESS && msLayerGetItems(lp) == MS_SUCCESS) {
 
       /* Remove group names from property names if using groupname/itemname syntax */
@@ -3152,8 +3145,9 @@ void FLTPreParseFilterForAliasAndGroup(FilterEncodingNode *psFilterNode,
       for(i=0; i<lp->numitems; i++) {
         if (!lp->items[i] || strlen(lp->items[i]) <= 0)
           continue;
+        char szTmp[256];
         snprintf(szTmp, sizeof(szTmp), "%s_alias", lp->items[i]);
-        pszFullName = msOWSLookupMetadata(&(lp->metadata), namespaces, szTmp);
+        const char *pszFullName = msOWSLookupMetadata(&(lp->metadata), namespaces, szTmp);
         if (pszFullName) {
           FLTReplacePropertyName(psFilterNode, pszFullName,
                                  lp->items[i]);

mapogcfiltercommon.cpp

@@ -579,24 +579,23 @@ char *FLTGetSpatialComparisonCommonExpression(FilterEncodingNode *psNode, layerO
 char *FLTGetFeatureIdCommonExpression(FilterEncodingNode *psFilterNode, layerObj *lp)
 {
   char *pszExpression = NULL;
-  int nTokens = 0, i=0, bString=0;
-  char **tokens = NULL;
-  const char *pszAttribute=NULL;
 
 #if defined(USE_WMS_SVR) || defined(USE_WFS_SVR) || defined(USE_WCS_SVR) || defined(USE_SOS_SVR)
   if (psFilterNode->pszValue) {
-    pszAttribute = msOWSLookupMetadata(&(lp->metadata), "OFG", "featureid");
+    const char *pszAttribute = msOWSLookupMetadata(&(lp->metadata), "OFG", "featureid");
     if (pszAttribute) {
-      tokens = msStringSplit(psFilterNode->pszValue,',', &nTokens);
+      int nTokens = 0;
+      char **tokens = msStringSplit(psFilterNode->pszValue,',', &nTokens);
       if (tokens && nTokens > 0) {
-        for (i=0; i<nTokens; i++) {
+        for (int i=0; i<nTokens; i++) {
           char *pszTmp = NULL;
           int bufferSize = 0;
           const char* pszId = tokens[i];
           const char* pszDot = strrchr(pszId, '.');
           if( pszDot )
             pszId = pszDot + 1;
 
+          int bString=0;
           if (i == 0) {
             if(FLTIsNumeric(pszId) == MS_FALSE)
               bString = 1;

textlayout.c

@@ -696,7 +696,6 @@ int msLayoutTextSymbol(mapObj *map, textSymbolObj *ts, textPathObj *tgret) {
 
 
   for(i=0;i<nruns;i++) {
-    unsigned int glyph_count,j;
     if(!runs[i].face) continue;
     peny = (1 - tgret->numlines + runs[i].line_number) * tgret->line_height;
     if(peny != oldpeny) {
@@ -714,7 +713,7 @@ int msLayoutTextSymbol(mapObj *map, textSymbolObj *ts, textPathObj *tgret) {
       unsigned int *codepoint = glyphs.codepoints + runs[i].offset;
       alloc_glyphs += runs[i].length;
       tgret->glyphs = msSmallRealloc(tgret->glyphs, alloc_glyphs * sizeof(glyphObj));
-      for(j=0;j<runs[i].length;j++) {
+      for(unsigned int j=0;j<runs[i].length;j++) {
         glyphObj *g = &tgret->glyphs[tgret->numglyphs + j];
         g->glyph = msGetGlyphByIndex(runs[i].face,tgret->glyph_size, *codepoint);
         g->face = runs[i].face;
@@ -746,11 +745,13 @@ int msLayoutTextSymbol(mapObj *map, textSymbolObj *ts, textPathObj *tgret) {
       hb_buffer_set_direction(buf, (runs[i].rtl%2) ? HB_DIRECTION_RTL :HB_DIRECTION_LTR);
       hb_buffer_add_utf32(buf,glyphs.unicodes + runs[i].offset, runs[i].length, 0, runs[i].length);
       hb_shape(font,buf,hbfeatures,2);
+
+      unsigned int glyph_count;
       glyph_info = hb_buffer_get_glyph_infos(buf, &glyph_count);
       glyph_pos = hb_buffer_get_glyph_positions(buf, &glyph_count);
       alloc_glyphs += glyph_count;
       tgret->glyphs = msSmallRealloc(tgret->glyphs, alloc_glyphs * sizeof(glyphObj));
-      for(j=0;j<glyph_count;j++) {
+      for(unsigned int j=0;j<glyph_count;j++) {
         glyphObj *g = &tgret->glyphs[tgret->numglyphs + j];
         g->glyph = msGetGlyphByIndex(runs[i].face,tgret->glyph_size,glyph_info[j].codepoint);
         g->face = runs[i].face;