Fix high-bit comparison compiler warning in pg_dump.

bmomjian · bmomjian · commit 922599464f62 · 2004-08-28T22:52:50.000Z
Philip Warner
diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c
@@ -5,7 +5,7 @@
  *	Implements the basic DB functions used by the archiver.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.55 2004/08/20 20:00:34 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.56 2004/08/28 22:52:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,8 +37,8 @@ static void notice_processor(void *arg, const char *message);
 static char *_sendSQLLine(ArchiveHandle *AH, char *qry, char *eos);
 static char *_sendCopyLine(ArchiveHandle *AH, char *qry, char *eos);
 
-static int _isIdentChar(char c);
-static int _isDQChar(char c, int atStart);
+static int _isIdentChar(unsigned char c);
+static int _isDQChar(unsigned char c, int atStart);
 
 #define DB_MAX_ERR_STMT 128
 
@@ -864,14 +864,14 @@ CommitTransactionXref(ArchiveHandle *AH)
 	destroyPQExpBuffer(qry);
 }
 
-static int _isIdentChar(char c)
+static int _isIdentChar(unsigned char c)
 {
 	if (		(c >= 'a' && c <= 'z')
 		||	(c >= 'A' && c <= 'Z')
 		||	(c >= '0' && c <= '9')
 		||	(c == '_')
 		||	(c == '$')
-		||	(c >= '\200' && c <= '\377')
+		||	(c >= (unsigned char)'\200') /* no need to check <= \377 */
 	   )
 	{
 		return 1;
@@ -882,13 +882,13 @@ static int _isIdentChar(char c)
 	}
 }
 
-static int _isDQChar(char c, int atStart)
-{	
+static int _isDQChar(unsigned char c, int atStart)
+{
 	if (		(c >= 'a' && c <= 'z')
 		||	(c >= 'A' && c <= 'Z')
 		||	(c == '_')
 		||	(atStart == 0 && c >= '0' && c <= '9')
-		||	(c >= '\200' && c <= '\377')
+		||	(c >= (unsigned char)'\200') /* no need to check <= \377 */
 	   )
 	{
 		return 1;

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`* Implements the basic DB functions used by the archiver.`
`6`	`6`	`*`
`7`	`7`	`* IDENTIFICATION`
`8`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.55 2004/08/20 20:00:34 momjian Exp $`
	`8`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.56 2004/08/28 22:52:50 momjian Exp $`
`9`	`9`	`*`
`10`	`10`	`*-------------------------------------------------------------------------`
`11`	`11`	`*/`
`@@ -37,8 +37,8 @@ static void notice_processor(void arg, const char message);`
`37`	`37`	`static char _sendSQLLine(ArchiveHandle AH, char qry, char eos);`
`38`	`38`	`static char _sendCopyLine(ArchiveHandle AH, char qry, char eos);`
`39`	`39`
`40`		`-static int _isIdentChar(char c);`
`41`		`-static int _isDQChar(char c, int atStart);`
	`40`	`+static int _isIdentChar(unsigned char c);`
	`41`	`+static int _isDQChar(unsigned char c, int atStart);`
`42`	`42`
`43`	`43`	`#define DB_MAX_ERR_STMT 128`
`44`	`44`
`@@ -864,14 +864,14 @@ CommitTransactionXref(ArchiveHandle *AH)`
`864`	`864`	`destroyPQExpBuffer(qry);`
`865`	`865`	`}`
`866`	`866`
`867`		`-static int _isIdentChar(char c)`
	`867`	`+static int _isIdentChar(unsigned char c)`
`868`	`868`	`{`
`869`	`869`	`if ( (c >= 'a' && c <= 'z')`
`870`	`870`	`\|\| (c >= 'A' && c <= 'Z')`
`871`	`871`	`\|\| (c >= '0' && c <= '9')`
`872`	`872`	`\|\| (c == '_')`
`873`	`873`	`\|\| (c == '$')`
`874`		`- \|\| (c >= '\200' && c <= '\377')`
	`874`	`+ \|\| (c >= (unsigned char)'\200') /* no need to check <= \377 */`
`875`	`875`	`)`
`876`	`876`	`{`
`877`	`877`	`return 1;`
`@@ -882,13 +882,13 @@ static int _isIdentChar(char c)`
`882`	`882`	`}`
`883`	`883`	`}`
`884`	`884`
`885`		`-static int _isDQChar(char c, int atStart)`
`886`		`-{`
	`885`	`+static int _isDQChar(unsigned char c, int atStart)`
	`886`	`+{`
`887`	`887`	`if ( (c >= 'a' && c <= 'z')`
`888`	`888`	`\|\| (c >= 'A' && c <= 'Z')`
`889`	`889`	`\|\| (c == '_')`
`890`	`890`	`\|\| (atStart == 0 && c >= '0' && c <= '9')`
`891`		`- \|\| (c >= '\200' && c <= '\377')`
	`891`	`+ \|\| (c >= (unsigned char)'\200') /* no need to check <= \377 */`
`892`	`892`	`)`
`893`	`893`	`{`
`894`	`894`	`return 1;`