[GNUnet-SVN] r35543 - in gnunet/src: ats-tests include

[gnunet]

Author: wachs
Date: 2015-04-20 22:10:57 +0200 (Mon, 20 Apr 2015)
New Revision: 35543

Modified:
   gnunet/src/ats-tests/perf_ats.c
   gnunet/src/include/gnunet_ats_service.h
Log:
removing ATS preference count 


Modified: gnunet/src/ats-tests/perf_ats.c
===================================================================
--- gnunet/src/ats-tests/perf_ats.c     2015-04-20 13:20:21 UTC (rev 35542)
+++ gnunet/src/ats-tests/perf_ats.c     2015-04-20 20:10:57 UTC (rev 35543)
@@ -364,7 +364,7 @@
   char *conf_name;
   char *comm_name;
   char *dotexe;
-  char *prefs[GNUNET_ATS_PreferenceCount] = GNUNET_ATS_PreferenceTypeString;
+  char *prefs[] = GNUNET_ATS_PreferenceTypeString;
   int c;
 
   result = 0;
@@ -432,10 +432,8 @@
 
   if (0 != strcmp (pref_str, "NONE"))
   {
-    for (c = 0; c < GNUNET_ATS_PreferenceCount; c++)
+    for (c = 0; c < GNUNET_ATS_PREFERENCE_END; c++)
     {
-      if (c == GNUNET_ATS_PREFERENCE_END)
-        continue;
       if (0 == strcmp (pref_str, prefs[c]))
       {
         pref_val = c;

Modified: gnunet/src/include/gnunet_ats_service.h
===================================================================
--- gnunet/src/include/gnunet_ats_service.h     2015-04-20 13:20:21 UTC (rev 
35542)
+++ gnunet/src/include/gnunet_ats_service.h     2015-04-20 20:10:57 UTC (rev 
35543)
@@ -605,11 +605,6 @@
 
 
 /**
- * Number of preference types supported by ATS
- */
-#define GNUNET_ATS_PreferenceCount 3
-
-/**
  * ATS preference types as array initializer
  */
 #define GNUNET_ATS_PreferenceType {GNUNET_ATS_PREFERENCE_BANDWIDTH, 
GNUNET_ATS_PREFERENCE_LATENCY, GNUNET_ATS_PREFERENCE_END}