[GNUnet-SVN] r24079 - gnunet/src/namestore

[gnunet]

Author: grothoff
Date: 2012-09-28 11:45:26 +0200 (Fri, 28 Sep 2012)
New Revision: 24079

Modified:
   gnunet/src/namestore/gnunet-service-namestore.c
   gnunet/src/namestore/plugin_namestore_postgres.c
Log:
-simplify

Modified: gnunet/src/namestore/gnunet-service-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-service-namestore.c     2012-09-28 09:44:18 UTC 
(rev 24078)
+++ gnunet/src/namestore/gnunet-service-namestore.c     2012-09-28 09:45:26 UTC 
(rev 24079)
@@ -1718,7 +1718,7 @@
   /**
    * Iteration complete
    */
-  IT_SUCCESS_NOT_MORE_RESULTS_AVAILABLE = 1,
+  IT_SUCCESS_NOT_MORE_RESULTS_AVAILABLE = 1
 };
 
 

Modified: gnunet/src/namestore/plugin_namestore_postgres.c
===================================================================
--- gnunet/src/namestore/plugin_namestore_postgres.c    2012-09-28 09:44:18 UTC 
(rev 24078)
+++ gnunet/src/namestore/plugin_namestore_postgres.c    2012-09-28 09:45:26 UTC 
(rev 24079)
@@ -164,11 +164,10 @@
     create_indices (plugin->dbh);
   PQclear (res);
 
-#define ALL "zone_key, record_name, record_count, record_data, 
block_expiration_time, signature"
   if ((GNUNET_OK !=
        GNUNET_POSTGRES_prepare (plugin->dbh,
                                "put_records",
-                               "INSERT INTO ns091records (" ALL 
+                               "INSERT INTO ns091records (zone_key, 
record_name, record_count, record_data, block_expiration_time, signature" 
                                ", zone_delegation, zone_hash, 
record_name_hash, rvalue) VALUES "
                                "($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)", 
10)) ||
       (GNUNET_OK !=
@@ -178,27 +177,27 @@
       (GNUNET_OK !=
        GNUNET_POSTGRES_prepare (plugin->dbh,
                                "iterate_records",
-                               "SELECT " ALL
+                               "SELECT zone_key, record_name, record_count, 
record_data, block_expiration_time, signature" 
                                " FROM ns091records WHERE zone_hash=$1 AND 
record_name_hash=$2 ORDER BY rvalue LIMIT 1 OFFSET $3", 3)) ||
       (GNUNET_OK !=
        GNUNET_POSTGRES_prepare (plugin->dbh,
                                "iterate_by_zone",
-                               "SELECT " ALL
+                               "SELECT zone_key, record_name, record_count, 
record_data, block_expiration_time, signature" 
                                " FROM ns091records WHERE zone_hash=$1 ORDER BY 
rvalue  LIMIT 1 OFFSET $2", 2)) ||
       (GNUNET_OK !=
        GNUNET_POSTGRES_prepare (plugin->dbh,
                                "iterate_by_name",
-                               "SELECT " ALL 
+                               "SELECT zone_key, record_name, record_count, 
record_data, block_expiration_time, signature" 
                                " FROM ns091records WHERE record_name_hash=$1 
ORDER BY rvalue LIMIT 1 OFFSET $2", 2)) ||
       (GNUNET_OK !=
        GNUNET_POSTGRES_prepare (plugin->dbh,
                                "iterate_all",
-                               "SELECT " ALL
+                               "SELECT zone_key, record_name, record_count, 
record_data, block_expiration_time, signature" 
                                " FROM ns091records ORDER BY rvalue LIMIT 1 
OFFSET $1", 1)) ||
       (GNUNET_OK !=
        GNUNET_POSTGRES_prepare (plugin->dbh,
                                "zone_to_name",
-                               "SELECT " ALL
+                               "SELECT zone_key, record_name, record_count, 
record_data, block_expiration_time, signature"
                                " FROM ns091records WHERE zone_hash=$1 AND 
zone_delegation=$2", 2)) ||
       (GNUNET_OK !=
        GNUNET_POSTGRES_prepare (plugin->dbh,
@@ -209,7 +208,6 @@
     plugin->dbh = NULL;
     return GNUNET_SYSERR;
   }
-#undef ALL
   return GNUNET_OK;
 }