OSDN Git Service

Fix compiler warnings on 64-bit boxes: difference between
authorTeodor Sigaev <teodor@sigaev.ru>
Wed, 6 Sep 2006 07:22:14 +0000 (07:22 +0000)
committerTeodor Sigaev <teodor@sigaev.ru>
Wed, 6 Sep 2006 07:22:14 +0000 (07:22 +0000)
pointers are int64, but warnings are emitted for position info in
error messages in parser, so, just cast it to int32

contrib/hstore/hstore_io.c

index f46b755..1faecad 100644 (file)
@@ -48,7 +48,7 @@ get_val( HSParser *state, bool ignoreeq, bool *escaped ) {
                        } else if ( *(state->ptr) == '\0' ) {
                                return false;
                        } else if (  *(state->ptr) == '=' && !ignoreeq ) {
-                               elog(ERROR,"Syntax error near '%c' at postion %d", *(state->ptr), state->ptr-state->begin);
+                               elog(ERROR,"Syntax error near '%c' at postion %d", *(state->ptr), (int4)(state->ptr-state->begin));
                        } else if ( *(state->ptr) == '\\' ) {
                                st = GV_WAITESCIN;
                        } else if ( !isspace(*(state->ptr)) ) {
@@ -147,7 +147,7 @@ parse_hstore( HSParser *state ) {
                        } else if ( *(state->ptr) == '\0' ) {
                                elog(ERROR,"Unexpectd end of string");
                        } else if (!isspace(*(state->ptr))) {
-                               elog(ERROR,"Syntax error near '%c' at postion %d", *(state->ptr), state->ptr-state->begin);
+                               elog(ERROR,"Syntax error near '%c' at postion %d", *(state->ptr), (int4)(state->ptr-state->begin));
                        }
                } else if ( st == WGT ) {
                        if ( *(state->ptr) == '>' ) {
@@ -155,7 +155,7 @@ parse_hstore( HSParser *state ) {
                        } else if ( *(state->ptr) == '\0' ) {
                                elog(ERROR,"Unexpectd end of string");
                        } else { 
-                               elog(ERROR,"Syntax error near '%c' at postion %d", *(state->ptr), state->ptr-state->begin);
+                               elog(ERROR,"Syntax error near '%c' at postion %d", *(state->ptr), (int4)(state->ptr-state->begin));
                        }
                } else if ( st == WVAL ) {
                        if ( !get_val(state, true, &escaped) )
@@ -178,7 +178,7 @@ parse_hstore( HSParser *state ) {
                        } else if ( *(state->ptr) == '\0' ) {
                                return;
                        } else if (!isspace(*(state->ptr))) {
-                               elog(ERROR,"Syntax error near '%c' at postion %d", *(state->ptr), state->ptr-state->begin);
+                               elog(ERROR,"Syntax error near '%c' at postion %d", *(state->ptr), (int4)(state->ptr-state->begin));
                        }
                } else 
                        elog(ERROR,"Unknown state %d at line %d in file '%s'", st, __LINE__, __FILE__);