Changeset 2789 for trunk/tools/database

Timestamp:

Feb 15, 2000, 2:31:06 PM (26 years ago)

Author:

bird

Message:

Bugfixes. Functionnames may be quite long...

Location:

trunk/tools/database

Files:

• APIImport.cpp (modified) (3 diffs)
• CreateTables.sql (modified) (2 diffs)

trunk/tools/database/APIImport.cpp

@@ -1 @@
-/* $Id: APIImport.cpp,v 1.4 2000-02-14 13:49:12 bird Exp $ */
+/* $Id: APIImport.cpp,v 1.5 2000-02-15 13:31:05 bird Exp $ */
 /*
  *
@@ -283 +283 @@
                         if (!pFile->isDef() || export.ulOrdinal < ORD_START_INTERNAL_FUNCTIONS)
                         {
-                            char szIntName[64];
-                            char szName[64];
+                            char szIntName[256];
+                            char szName[256];
 
                             /* exported name */
@@ -301 +301 @@
                                     pszFilename, export.ulOrdinal, &szName[0], &szIntName[0]);
 
-                            fOk = dbInsertUpdateFunction(sDll,
-                                                         &szName[0],
-                                                         &szIntName[0],
-                                                         export.ulOrdinal,
-                                                         pOptions->fIgnoreOrdinals && export.ulOrdinal != 0xffffffffUL);
-                            if (fOk)
-                                cFunctions++;
+                            /* length test */
+                            if (strlen(szIntName) > 100)
+                            {
+                                fprintf(phLog, "%s: error - intname is too long (%d). %s\n", pszFilename, strlen(szIntName), szIntName);
+                                lRc++;
+                            }
+                            else if (strlen(szName) > 100)
+                            {
+                                fprintf(phLog, "%s: error - name is too long (%d). %s\n", pszFilename, strlen(szName), szName);
+                                lRc++;
+                            }
+                            else
+                            {
+                                fOk = dbInsertUpdateFunction(sDll,
+                                                             &szName[0],
+                                                             &szIntName[0],
+                                                             export.ulOrdinal,
+                                                             pOptions->fIgnoreOrdinals && export.ulOrdinal != 0xffffffffUL);
+                                if (fOk)
+                                    cFunctions++;
+                            }
                         }
 

trunk/tools/database/CreateTables.sql

@@ -1 @@
--- $Id: CreateTables.sql,v 1.5 2000-02-14 13:49:12 bird Exp $
+-- $Id: CreateTables.sql,v 1.6 2000-02-15 13:31:06 bird Exp $
 --
 -- Create all tables.
@@ -30 +30 @@
     dll      TINYINT  NOT NULL,
     aliasfn  INTEGER  NOT NULL DEFAULT -1,
-    name     VARCHAR(74) NOT NULL,
-    intname  VARCHAR(74) NOT NULL,
+    name     VARCHAR(100) NOT NULL,
+    intname  VARCHAR(100) NOT NULL,
     state    TINYINT  NOT NULL DEFAULT 0,
     ordinal  INTEGER  NOT NULL,