[GNUnet-SVN] r25660 - monkey/trunk/pathologist/src/pathologist

[gnunet]

Author: teichm
Date: 2012-12-27 22:29:13 +0100 (Thu, 27 Dec 2012)
New Revision: 25660

Modified:
   monkey/trunk/pathologist/src/pathologist/action_api.c
   monkey/trunk/pathologist/src/pathologist/edb_api.c
Log:
no more duplicate expressions in the report

Modified: monkey/trunk/pathologist/src/pathologist/action_api.c
===================================================================
--- monkey/trunk/pathologist/src/pathologist/action_api.c       2012-12-27 
19:04:29 UTC (rev 25659)
+++ monkey/trunk/pathologist/src/pathologist/action_api.c       2012-12-27 
21:29:13 UTC (rev 25660)
@@ -52,7 +52,6 @@
     const char *expressionSyntax;
     const char *expressionValue;
     int isCall;
-    int lineNo;
 };
 
 
@@ -313,13 +312,12 @@
     struct Expression *expression;
     struct Function *function = (struct Function *) cls;
 
-    if (NULL == colValues[0] || NULL == colValues[1] || NULL == colValues[2])
-       return 1;               /* Error */
+    if (NULL == colValues[0] || NULL == colValues[1])
+               return 1;               /* Error */
 
     expression = MONKEY_malloc(sizeof(struct Expression));
     expression->expressionSyntax = MONKEY_strdup(colValues[0]);
-    expression->lineNo = atoi(colValues[1]);
-    expression->isCall = atoi(colValues[2]);
+    expression->isCall = atoi(colValues[1]);
     expression->expressionValue = NULL;
     expression->next = NULL;
     expression->prev = NULL;
@@ -338,13 +336,12 @@
     struct Expression *expression;
     struct Trace *trace = (struct Trace *) cls;
 
-    if (NULL == colValues[0] || NULL == colValues[1] || NULL == colValues[2])
-       return 1;               /* Error */
+    if (NULL == colValues[0] || NULL == colValues[1])
+               return 1;               /* Error */
 
     expression = MONKEY_malloc(sizeof(struct Expression));
     expression->expressionSyntax = MONKEY_strdup(colValues[0]);
-    expression->lineNo = atoi(colValues[1]);
-    expression->isCall = atoi(colValues[2]);
+    expression->isCall = atoi(colValues[1]);
     expression->expressionValue = NULL;
     expression->next = NULL;
     expression->prev = NULL;
@@ -506,12 +503,12 @@
 
            expressionPtr = functionPtr->expressionListHead;
            while (NULL != expressionPtr) {
-               printf("%s = %s, line: %d\n",
+               printf("%s = %s\n",
                       expressionPtr->expressionSyntax,
                       (NULL ==
                        expressionPtr->
                        expressionValue) ? "No Value" : expressionPtr->
-                      expressionValue, expressionPtr->lineNo);
+                      expressionValue);
                expressionPtr = expressionPtr->next;
            }
 

Modified: monkey/trunk/pathologist/src/pathologist/edb_api.c
===================================================================
--- monkey/trunk/pathologist/src/pathologist/edb_api.c  2012-12-27 19:04:29 UTC 
(rev 25659)
+++ monkey/trunk/pathologist/src/pathologist/edb_api.c  2012-12-27 21:29:13 UTC 
(rev 25660)
@@ -280,7 +280,7 @@
   char *query;
   if (MONKEY_asprintf
          (&query,
-          "select distinct expr_syntax, start_lineno, is_call from Expression 
where start_lineno = 0 and end_lineno = 32767") == -1)
+          "select distinct expr_syntax, is_call from Expression where 
start_lineno = 0 and end_lineno = 32767") == -1)
        {
          fprintf(stderr, "Memory allocation problem occurred!\n");
          return MONKEY_NO;
@@ -317,7 +317,7 @@
   char *query;
   if (MONKEY_asprintf
       (&query,
-       "select expr_syntax, start_lineno, is_call from Expression where 
file_name LIKE \'%%%s\' and start_lineno <= %d and end_lineno >= %d and 
end_lineno != 32767",
+       "select distinct expr_syntax, is_call from Expression where file_name 
LIKE \'%%%s\' and start_lineno <= %d and end_lineno >= %d and end_lineno != 
32767",
        file_name, start_line_no, start_line_no) == -1)
     {
       fprintf(stderr, "Memory allocation problem occurred!\n");