Changeset 3944 for trunk/tools/database

Timestamp:

Aug 2, 2000, 10:20:36 PM (25 years ago)

Author:

bird

Message:

Corrections.

Location:

trunk/tools/database

Files:

• StateUpd.cpp (modified) (5 diffs)
• db.cpp (modified) (2 diffs)

trunk/tools/database/StateUpd.cpp

@@ -1 @@
-/* $Id: StateUpd.cpp,v 1.31 2000-08-02 18:10:11 bird Exp $
+/* $Id: StateUpd.cpp,v 1.32 2000-08-02 20:20:35 bird Exp $
  *
  * StateUpd - Scans source files for API functions and imports data on them.
@@ -216 +216 @@
                 case 'S':
                     options.fRecursive = TRUE;
-                    fprintf(stderr, "This option (-s) is currently broken\n");
-                    return -1;
+                    fprintf(stderr, "Warning: -s processes subdirs of source for one DLL\n");
+                    break;
 
                 case 'u':
@@ -1342 +1342 @@
                             pszEnd = strlen(pszEnd) + pszEnd + 1;
                             *pszEnd = '\0';
-                            memset(psz, ' ', pszP2 - psz);
+                            if (pszP2 > psz) //FIXME here is a bug. (opengl\mesa\span.c(gl_write_multitexture_span))
+                                memset(psz, ' ', pszP2 - psz);
+                            else
+                                fprintf(phLog, "assert: line %d\n", __LINE__);
                         }
                         pFnDesc->apszParamType[j] = trim(apszArgs[j]);
@@ -2777 +2780 @@
  * @remark    Comments are skipped.
  *            No tests for strings ("...asdf").
+ *            TODO: Multiline preprocessor directives....
  */
 static char *skipBackwards(const char *pszStopAt, const char *pszFrom, int &iLine, char **papszLines)
@@ -2817 +2821 @@
                 while (*pszStart == ' ')
                     pszStart++;
-                if (*pszStart != '\0' && *pszStart != '#'
-                    && !(*pszStart == '/' && pszStart[1] == '/'))
+
+                /* stop at preprocessor stuff */
+                if (*pszStart == '#')
+                    return (char*)pszFrom;
+
+                if (*pszStart != '\0' && !(*pszStart == '/' && pszStart[1] == '/'))
                 {   /* find '//' */
                     pszStart = strstr(pszStart, "//");

trunk/tools/database/db.cpp

@@ -1 @@
-/* $Id: db.cpp,v 1.20 2000-08-02 18:10:17 bird Exp $ *
+/* $Id: db.cpp,v 1.21 2000-08-02 20:20:36 bird Exp $ *
  *
  * DB - contains all database routines.
@@ -2039 +2039 @@
         {
             /* delete parameters */
-            sprintf(&szQuery[0], "DELETE FROM parameter WHERE function %s", row[0]);
+            sprintf(&szQuery[0], "DELETE FROM parameter WHERE function = %s", row[0]);
             rc = mysql_query(pmysql, &szQuery[0]);
             if (rc) fRc = FALSE;
 
             /* author relations */
-            sprintf(&szQuery[0], "DELETE FROM fnauthor WHERE function %s", row[0]);
+            sprintf(&szQuery[0], "DELETE FROM fnauthor WHERE function = %s", row[0]);
             rc = mysql_query(pmysql, &szQuery[0]);
             if (rc) fRc = FALSE;