[79289] branches/gsoc11-rev-upgrade/base/src/cregistry/registry.c

[cal at macports.org]

Revision: 79289
          http://trac.macports.org/changeset/79289
Author:   cal at macports.org
Date:     2011-06-08 03:09:18 -0700 (Wed, 08 Jun 2011)
Log Message:
-----------
rev-uprgade: Cleanup, modeline

Modified Paths:
--------------
    branches/gsoc11-rev-upgrade/base/src/cregistry/registry.c

Modified: branches/gsoc11-rev-upgrade/base/src/cregistry/registry.c
===================================================================
--- branches/gsoc11-rev-upgrade/base/src/cregistry/registry.c	2011-06-08 10:06:55 UTC (rev 79288)
+++ branches/gsoc11-rev-upgrade/base/src/cregistry/registry.c	2011-06-08 10:09:18 UTC (rev 79289)
@@ -1,6 +1,7 @@
 /*
  * registry.c
  * $Id$
+ * vim:expandtab:tw=80
  *
  * Copyright (c) 2007 Chris Pickel <sfiera at macports.org>
  * All rights reserved.
@@ -261,7 +262,6 @@
     if (sqlite3_prepare(reg->db, query, -1, &stmt, NULL) == SQLITE_OK) {
         int r;
         reg_entry* entry;
-        reg_file* file;
         Tcl_HashEntry* curr;
         Tcl_HashSearch search;
         /* XXX: Busy waiting, consider using sqlite3_busy_handler/timeout */
@@ -281,13 +281,10 @@
                     Tcl_DeleteHashTable(&reg->open_entries);
                     for (curr = Tcl_FirstHashEntry(&reg->open_files, &search);
                             curr != NULL; curr = Tcl_NextHashEntry(&search)) {
-                        file = Tcl_GetHashValue(curr);
-                        if (file->proc) {
-                            free(file->proc);
-                        }
-                        if (file->key.path) {
-                            free(file->key.path);
-                        }
+                        reg_file* file = Tcl_GetHashValue(curr);
+
+                        free(file->proc);
+                        free(file->key.path);
                         free(file);
                     }
                     Tcl_DeleteHashTable(&reg->open_files);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110608/ddd682e9/attachment.html>