Change to sqlite3AffinityType() to remove hex constants. (CVS 2298)

FossilOrigin-Name: d8b4b0ef13dddbf527e7440e7343c458210dceac

diff --git a/manifest b/manifest
index 74a18ed58d8912e253e554bf3dda350f6ce94f75..ceb99b8a90965b08eff214cf7c1227dcea01fdd3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Tweaks\sto\sthe\skeyword\shash\sgenerator.\s\sTried\sto\smake\sit\sa\slittle\sfaster.\r\nIf\snothing\selse,\sthe\skeyword\shash\stable\sis\snow\sa\slittle\ssmaller.\s(CVS\s2297)
-D 2005-02-01T01:40:44
+C Change\sto\ssqlite3AffinityType()\sto\sremove\shex\sconstants.\s(CVS\s2298)
+D 2005-02-01T02:13:29
 F Makefile.in ffd81f5e926d40b457071b4de8d7c1fa18f39b5a
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -31,7 +31,7 @@ F src/attach.c f78f76bc6a8e5e487ca53636e21ccba2484a9a61
 F src/auth.c 18c5a0befe20f3a58a41e3ddd78f372faeeefe1f
 F src/btree.c e68ae12c8b12ef9d45d58d931c36c184055a3880
 F src/btree.h 74d19cf40ab49fd69abe9e4e12a6c321ad86c497
-F src/build.c 7e50cb572eedf50b3f5f499bce7d5340d9b00b63
+F src/build.c 321c80debeee58019808ff9486aed879e18f9d79
 F src/cursor.c de73c00aefc4747ad59b5105cf38bbff0667922e
 F src/date.c f3d1f5cd1503dabf426a198f3ebef5afbc122a7f
 F src/delete.c 4b94395b52a8f7785acd71135c2ce54f3f5550b3
@@ -272,7 +272,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl 3e522a06ad41992023c80ca29a048ae2331ca5bd
-P abe9f5e81f1196f28eec628e898b2a994c4d659d
-R aaf87812bb4ebeec74a9818d212c6af5
-U drh
-Z e6d866cf99a5bfeaa357fd188a3face1
+P 4eca6c05abdf3955c5fd7bd3a22c87cd4741d656
+R dccd9fc3b4d1260c30825cd7dc43a46d
+U danielk1977
+Z edba349b2f77946ee84b1132004c3dd3

diff --git a/manifest.uuid b/manifest.uuid
index fa8f1c3b9a20bbdfdffdcfe7cec25c953eba9bb6..831d98941d15d0bb92cd0b2fab37fb5b1ed69750 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4eca6c05abdf3955c5fd7bd3a22c87cd4741d656
\ No newline at end of file
+d8b4b0ef13dddbf527e7440e7343c458210dceac
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index 2f8290cb82f21e96b68c4d5ce4fead4578c1b838..147f5f09047a09cd8f8971994cdd213fdc0bcc9f 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -22,7 +22,7 @@
 **     COMMIT
 **     ROLLBACK
 **
-** $Id: build.c,v 1.305 2005/02/01 01:21:55 danielk1977 Exp $
+** $Id: build.c,v 1.306 2005/02/01 02:13:29 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -885,12 +885,16 @@ static char sqlite3AffinityType(const char *zType, int nType){
   while( zIn!=zEnd ){
     h = (h<<8) + sqlite3UpperToLower[*zIn];
     zIn++;
-    if     ( h==0x63686172 ) aff = SQLITE_AFF_TEXT;           /* CHAR */
-    else if( h==0x636C6F62 ) aff = SQLITE_AFF_TEXT;           /* CLOB */
-    else if( h==0x74657874 ) aff = SQLITE_AFF_TEXT;           /* TEXT */
-    else if( h==0x626C6F62 && aff==SQLITE_AFF_NUMERIC ){      /* BLOB */
+    if( h==(('c'<<24)+('h'<<16)+('a'<<8)+'r') ){             /* CHAR */
+      aff = SQLITE_AFF_TEXT; 
+    }else if( h==(('c'<<24)+('l'<<16)+('o'<<8)+'b') ){       /* CLOB */
+      aff = SQLITE_AFF_TEXT;
+    }else if( h==(('t'<<24)+('e'<<16)+('x'<<8)+'t') ){       /* TEXT */
+      aff = SQLITE_AFF_TEXT;
+    }else if( h==(('b'<<24)+('l'<<16)+('o'<<8)+'b')          /* BLOB */
+        && aff==SQLITE_AFF_NUMERIC ){
       aff = SQLITE_AFF_NONE;
-    }else if( (h&0x00FFFFFF)==0x00696E74 ){                   /* INT */
+    }else if( (h&0x00FFFFFF)==(('i'<<16)+('n'<<8)+'t') ){    /* INT */
       aff = SQLITE_AFF_INTEGER; 
       break;
     }