use ATS functions to convert quality network type to string, instead of using string API

1 files changed, 30 insertions, 17 deletions

diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index f0af8f1a2..89158936d 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -1746,7 +1746,6 @@ static unsigned int
 load_quotas (const struct GNUNET_CONFIGURATION_Handle *cfg,
     unsigned long long *out_dest, unsigned long long *in_dest, int dest_length)
 {
-  char *network_str[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkTypeString;
   char * entry_in = NULL;
   char * entry_out = NULL;
   char * quota_out_str;
@@ -1758,8 +1757,12 @@ load_quotas (const struct GNUNET_CONFIGURATION_Handle *cfg,
   {
     in_dest[c] = 0;
     out_dest[c] = 0;
-    GNUNET_asprintf (&entry_out, "%s_QUOTA_OUT", network_str[c]);
-    GNUNET_asprintf (&entry_in, "%s_QUOTA_IN", network_str[c]);
+    GNUNET_asprintf (&entry_out,
+                     "%s_QUOTA_OUT",
+                     GNUNET_ATS_print_network_type (c));
+    GNUNET_asprintf (&entry_in,
+                     "%s_QUOTA_IN",
+                     GNUNET_ATS_print_network_type (c));
 
     /* quota out */
     if (GNUNET_OK
@@ -1786,23 +1789,27 @@ load_quotas (const struct GNUNET_CONFIGURATION_Handle *cfg,
       if (GNUNET_NO == res)
       {
         GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-            _("Could not load quota for network `%s':  `%s', assigning default bandwidth %llu\n"),
-            network_str[c], quota_out_str, GNUNET_ATS_DefaultBandwidth);
+                   _("Could not load quota for network `%s':  `%s', assigning default bandwidth %llu\n"),
+                   GNUNET_ATS_print_network_type (c),
+                   quota_out_str,
+                   GNUNET_ATS_DefaultBandwidth);
         out_dest[c] = GNUNET_ATS_DefaultBandwidth;
       }
       else
       {
         GNUNET_log(GNUNET_ERROR_TYPE_INFO,
-            _("Outbound quota configure for network `%s' is %llu\n"),
-            network_str[c], out_dest[c]);
+                   _("Outbound quota configure for network `%s' is %llu\n"),
+                   GNUNET_ATS_print_network_type (c),
+                   out_dest[c]);
       }
       GNUNET_free(quota_out_str);
     }
     else
     {
       GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-          _("No outbound quota configured for network `%s', assigning default bandwidth %llu\n"),
-          network_str[c], GNUNET_ATS_DefaultBandwidth);
+                 _("No outbound quota configured for network `%s', assigning default bandwidth %llu\n"),
+                 GNUNET_ATS_print_network_type (c),
+                 GNUNET_ATS_DefaultBandwidth);
       out_dest[c] = GNUNET_ATS_DefaultBandwidth;
     }
 
@@ -1830,28 +1837,34 @@ load_quotas (const struct GNUNET_CONFIGURATION_Handle *cfg,
       if (GNUNET_NO == res)
       {
         GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-            _("Could not load quota for network `%s':  `%s', assigning default bandwidth %llu\n"),
-            network_str[c], quota_in_str, GNUNET_ATS_DefaultBandwidth);
+                   _("Could not load quota for network `%s':  `%s', assigning default bandwidth %llu\n"),
+                   GNUNET_ATS_print_network_type (c),
+                   quota_in_str,
+                   GNUNET_ATS_DefaultBandwidth);
         in_dest[c] = GNUNET_ATS_DefaultBandwidth;
       }
       else
       {
         GNUNET_log(GNUNET_ERROR_TYPE_INFO,
-            _("Inbound quota configured for network `%s' is %llu\n"),
-            network_str[c], in_dest[c]);
+                   _("Inbound quota configured for network `%s' is %llu\n"),
+                   GNUNET_ATS_print_network_type (c),
+                   in_dest[c]);
       }
       GNUNET_free(quota_in_str);
     }
     else
     {
       GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-          _("No outbound quota configure for network `%s', assigning default bandwidth %llu\n"),
-          network_str[c], GNUNET_ATS_DefaultBandwidth);
+                 _("No outbound quota configure for network `%s', assigning default bandwidth %llu\n"),
+                 GNUNET_ATS_print_network_type (c),
+                 GNUNET_ATS_DefaultBandwidth);
       in_dest[c] = GNUNET_ATS_DefaultBandwidth;
     }
     GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-        "Loaded quota for network `%s' (in/out): %llu %llu\n", network_str[c],
-        in_dest[c], out_dest[c]);
+               "Loaded quota for network `%s' (in/out): %llu %llu\n",
+               GNUNET_ATS_print_network_type (c),
+               in_dest[c],
+               out_dest[c]);
     GNUNET_free(entry_out);
     GNUNET_free(entry_in);
   }