MonetDB: Oct2010 - read_into_cache: annotate a bit

[Fabian Groffen]

Changeset: 23653c494842 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=23653c494842
Modified Files:
        clients/src/mapilib/Mapi.mx
Branch: Oct2010
Log Message:

read_into_cache: annotate a bit


diffs (44 lines):

diff -r 1161f24990d1 -r 23653c494842 clients/src/mapilib/Mapi.mx
--- a/clients/src/mapilib/Mapi.mx       Sun Nov 28 12:24:04 2010 +0100
+++ b/clients/src/mapilib/Mapi.mx       Tue Nov 30 16:58:26 2010 +0100
@@ -4039,14 +4039,14 @@
                if (line == NULL)
                        return mid->error;
                switch (*line) {
-               case PROMPTBEG:
+               case PROMPTBEG: /* \001 */
                        mid->active = NULL;
                        hdl->active = NULL;
                        /* set needmore flag if line equals PROMPT2 up
                           to newline */
-                       copy = PROMPT2;
+                       copy = PROMPT2; /* \001\002\n */
                        while (*line) {
-                               if (*line != *copy)
+                               if (*line != *copy) /* must be EOF or PROMPT1 
\001\001\n */
                                        return mid->error;
                                line++;
                                copy++;
@@ -4064,9 +4064,10 @@
                           yet (duh!), or if we've already seen
                           normal output for the current one */
                        if (result == NULL ||
-                           result->cache.writer > 0 ||
-                           result->querytype == Q_TABLE ||
-                           result->querytype == Q_UPDATE) {
+                                       result->cache.writer > 0 ||
+                                       result->querytype == Q_TABLE ||
+                                       result->querytype == Q_UPDATE)
+                       {
                                result = new_result(hdl);
                                hdl->active = result;
                        }
@@ -4091,7 +4092,7 @@
                        }
                        add_cache(result, strdup(line), !lookahead);
                        if (lookahead > 0 &&
-                           (result->querytype == -1/* unknown (not SQL) */  ||
+                           (result->querytype == -1 /* unknown (not SQL) */ ||
                             result->querytype == Q_TABLE ||
                             result->querytype == Q_UPDATE))
                                return mid->error;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list