Make compile quiet phase 2

MacOS X Maverics and later offers only LLVM compiler (clang) and it
warns for implicit type conversions between enums. This program uses
some enum types for a member in the same struct type but they cannot
be merged because one of them is defined in PostgreSQL. The situation
is safe as long as an enumeration and a word table are in one-to-one
correspondence so I decided to change the type of the member to
integer. This change make the commit
78415c006cd24f41d722a41014c526b43731968f useless so it is reverted
along with this commit.

Reported by Fujii Masao.

diff --git a/pgsp_json_int.h b/pgsp_json_int.h
index eeaa0af..61d780a 100644 (file)
--- a/pgsp_json_int.h
+++ b/pgsp_json_int.h
@@ -107,7 +107,7 @@ typedef enum
 
 typedef struct
 {
-       pgsp_prop_tags tag;             /* Tag to identify words */
+       int       tag;                          /* Tag to identify words */
        char *shortname;                /* Property name for short-style JSON */
        char *longname;                 /* Property name for long(normal)-style JSON */
        char *textname;                 /* Property name for Text representation */

diff --git a/pgsp_json_text.c b/pgsp_json_text.c
index be54e8c..454c49a 100644 (file)
--- a/pgsp_json_text.c
+++ b/pgsp_json_text.c
@@ -86,14 +86,9 @@ SETTERDECL(strategy)
                        break;
 
                case T_SetOp:
-                       switch (p->tag)
-                       {
-                               case S_Hashed:
-                                       vals->node_type = "HashSetOp";
-                                       break;
-                               default:
-                                       break;
-                       }
+                       if (p->tag == S_Hashed)
+                               vals->node_type = "HashSetOp";
+                       break;
 
                default:
                        break;