[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r24134 - gnunet/src/gns/nss
From: |
gnunet |
Subject: |
[GNUnet-SVN] r24134 - gnunet/src/gns/nss |
Date: |
Sun, 30 Sep 2012 00:29:39 +0200 |
Author: grothoff
Date: 2012-09-30 00:29:39 +0200 (Sun, 30 Sep 2012)
New Revision: 24134
Modified:
gnunet/src/gns/nss/nss_gns_query.c
Log:
-fixing style issue
Modified: gnunet/src/gns/nss/nss_gns_query.c
===================================================================
--- gnunet/src/gns/nss/nss_gns_query.c 2012-09-29 22:22:23 UTC (rev 24133)
+++ gnunet/src/gns/nss/nss_gns_query.c 2012-09-29 22:29:39 UTC (rev 24134)
@@ -33,70 +33,74 @@
* @param u the userdata (result struct)
* @return -1 on error else 0
*/
-int gns_resolve_name(int af, const char *name, struct userdata *u)
+int
+gns_resolve_name (int af,
+ const char *name,
+ struct userdata *u)
{
FILE *p;
char *cmd;
char line[128];
- if (af == AF_INET6)
+ if (AF_INET6 == af)
{
- if (-1 == asprintf(&cmd, "%s -t AAAA -u %s\n", "gnunet-gns -r", name))
+ if (-1 == asprintf (&cmd,
+ "%s -t AAAA -u %s\n",
+ "gnunet-gns -r", name))
return -1;
}
else
{
- if (-1 == asprintf(&cmd, "%s %s\n", "gnunet-gns -r -u", name))
+ if (-1 == asprintf (&cmd,
+ "%s %s\n",
+ "gnunet-gns -r -u", name))
return -1;
}
-
- p = popen(cmd,"r");
-
- if (p != NULL )
+ if (NULL == (p = popen (cmd, "r")))
{
- while (fgets( line, sizeof(line), p ) != NULL)
+ free (cmd);
+ return -1;
+ }
+ while (NULL != fgets (line, sizeof(line), p))
+ {
+ if (u->count >= MAX_ENTRIES)
+ break;
+ if (line[strlen(line)-1] == '\n')
{
-
- if (u->count >= MAX_ENTRIES)
- break;
-
- if (line[strlen(line)-1] == '\n')
+ line[strlen(line)-1] = '\0';
+ if (AF_INET == af)
{
- line[strlen(line)-1] = '\0';
- if (af == AF_INET)
+ if (inet_pton(af, line, &(u->data.ipv4[u->count])))
{
- if (inet_pton(af, line, &(u->data.ipv4[u->count])))
- {
- u->count++;
- u->data_len += sizeof(ipv4_address_t);
- }
- else
- {
- fclose (p);
- free (cmd);
- return -1;
- }
- }
- else if ((af == AF_INET6))
+ u->count++;
+ u->data_len += sizeof(ipv4_address_t);
+ }
+ else
+ {
+ fclose (p);
+ free (cmd);
+ return -1;
+ }
+ }
+ else if (AF_INET6 == af)
+ {
+ if (inet_pton(af, line, &(u->data.ipv6[u->count])))
{
- if (inet_pton(af, line, &(u->data.ipv6[u->count])))
- {
- u->count++;
- u->data_len += sizeof(ipv6_address_t);
- }
- else
- {
- fclose (p);
- free (cmd);
- return -1;
- }
- }
+ u->count++;
+ u->data_len += sizeof(ipv6_address_t);
+ }
+ else
+ {
+ fclose (p);
+ free (cmd);
+ return -1;
+ }
}
}
- fclose (p);
}
+ fclose (p);
free (cmd);
-
return 0;
+}
-}
+/* end of nss_gns_query.c */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r24134 - gnunet/src/gns/nss,
gnunet <=