[70500] branches/gsoc10-configfiles/base/src

[and.damore at macports.org]

Revision: 70500
          http://trac.macports.org/changeset/70500
Author:   and.damore at macports.org
Date:     2010-08-11 09:26:35 -0700 (Wed, 11 Aug 2010)
Log Message:
-----------
removing debugging printf() function calls and unused code

Modified Paths:
--------------
    branches/gsoc10-configfiles/base/src/cregistry/entry.c
    branches/gsoc10-configfiles/base/src/registry2.0/entryobj.c

Modified: branches/gsoc10-configfiles/base/src/cregistry/entry.c
===================================================================
--- branches/gsoc10-configfiles/base/src/cregistry/entry.c	2010-08-11 14:19:12 UTC (rev 70499)
+++ branches/gsoc10-configfiles/base/src/cregistry/entry.c	2010-08-11 16:26:35 UTC (rev 70500)
@@ -880,32 +880,21 @@
     char* insert = "INSERT INTO registry.files "
         "(id, path, mtime, active, md5sum) VALUES (?, ?, 0, 0, ?)";
         
-    printf("GSOCDBG: \tentered reg_entry_map_with_md5\n");
-    printf("GSOCDBG: \t\targ_count:%d\n",arg_count);
     /*  sqlite3_prepare() is documented as legacy, 
         cf. http://www.sqlite.org/c3ref/step.html
         sqlite3_prepare_v2() should be used instead */
     if ((sqlite3_prepare(reg->db, insert, -1, &stmt, NULL) == SQLITE_OK)
             && (sqlite3_bind_int64(stmt, 1, entry->id) == SQLITE_OK)) {
-        int i;
-        printf("GSOCDBG: \tlet's print files[] and md5sums[]\n");
-        for (i=0; i<arg_count; i++) {
-            printf("GSOCDBG: \t\tfiles[%d]:\"%s\"\n",i,files[i]);
-            printf("GSOCDBG: \t\tmd5sums[%d]:\"%s\"\n",i,md5sums[i]);
-        }
-        printf("GSOCDBG: \t\tentering the for loop\n");
+            int i;
             for (i=0; (i<arg_count) && result; i++) {
-            printf("GSOCDBG: \t\tloop iteration:%d\n",i);
             /*  cycles through files[] array of strings,
                 the if argument parse a file from the array and put in into
                 the SQL statement */
             if (sqlite3_bind_text(stmt, 2, files[i], -1, SQLITE_STATIC)
                     == SQLITE_OK) {
-                printf("GSOCDBG: \t\t\tinside first if branch\n");
                 if (sqlite3_bind_text(stmt, 3, md5sums[i], -1, SQLITE_STATIC)
                         == SQLITE_OK) {
                     int r;
-                    printf("GSOCDBG: \t\t\tinside second if branch\n");
                     do {
                         r = sqlite3_step(stmt);
                         switch (r) {
@@ -930,7 +919,6 @@
         reg_sqlite_error(reg->db, errPtr, insert);
         result = 0;
     }
-    printf("GSOCDBG: \texiting reg_entry_map_with_md5\n");
     if (stmt) {
         sqlite3_finalize(stmt);
     }

Modified: branches/gsoc10-configfiles/base/src/registry2.0/entryobj.c
===================================================================
--- branches/gsoc10-configfiles/base/src/registry2.0/entryobj.c	2010-08-11 14:19:12 UTC (rev 70499)
+++ branches/gsoc10-configfiles/base/src/registry2.0/entryobj.c	2010-08-11 16:26:35 UTC (rev 70500)
@@ -159,7 +159,6 @@
 static int entry_obj_filemap_with_md5(Tcl_Interp* interp, reg_entry* entry, int objc,
         Tcl_Obj* CONST objv[]) {
     reg_registry* reg = registry_for(interp, reg_attached);
-    printf("GSOCDBG: entering entry_obj_filemap_with_md5\n");
     if (objc != 3) {
         Tcl_WrongNumArgs(interp, 2, objv, "map {file md5checksum}-list");
         return TCL_ERROR;
@@ -180,18 +179,13 @@
             return TCL_ERROR;
         }
         
-        printf("GSOCDBG: size of list %d\n", listc);
         /*  remember to add check for malloc return values */
         files=malloc((listc/2)*sizeof(char *));
         md5sums=malloc((listc/2)*sizeof(char*));
         
-        printf("GSOCDBG: for loop\n");
         /*  fill in files[] and md5sums[] */
         for (i=0; i<listc; i+=2) { 
             list_counter=i/2;
-            /*if (Tcl_ListObjLength(interp, listv[i], &length) != TCL_OK) {
-                free(files); free(md5sums); return TCL_ERROR; } */
-            printf("GSOCDBG: \titem %d\n", list_counter); 
             element=NULL;
             if (Tcl_ListObjIndex(interp, listv[i], 0, &element) != TCL_OK) {
                 free(files); free(md5sums); return TCL_ERROR; } 
@@ -199,7 +193,6 @@
                 Tcl_SetErrorCode(interp, "illegal input", NULL); return TCL_ERROR; }
             else {
                 files[list_counter] = Tcl_GetString(element);
-                printf("GSOCDBG: \t\tfiles[%d]=\"%s\"\n", list_counter, files[list_counter]); }
             element=NULL;
             if (Tcl_ListObjIndex(interp, listv[i+1], 0, &element) != TCL_OK) {
                 free(files); free(md5sums); return TCL_ERROR; } 
@@ -207,7 +200,6 @@
                 Tcl_SetErrorCode(interp, "illegal input", NULL); return TCL_ERROR; }
             else {
                 md5sums[list_counter] = Tcl_GetString(element);
-                printf("GSOCDBG: \t\tmd5sums[%d]=\"%s\"\n", list_counter, md5sums[list_counter]); }
         }
         
         /*  change the condition, */
@@ -227,7 +219,6 @@
             result = registry_failed(interp, &error);
         }
         */
-        printf("GSOCDBG: exiting entry_obj_filemap_with_md5\n");
         return result;
     }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100811/0df73233/attachment.html>