[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r22811 - in gnunet/src: include util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r22811 - in gnunet/src: include util |
Date: |
Fri, 20 Jul 2012 22:18:49 +0200 |
Author: grothoff
Date: 2012-07-20 22:18:49 +0200 (Fri, 20 Jul 2012)
New Revision: 22811
Modified:
gnunet/src/include/gnunet_gns_service.h
gnunet/src/include/gnunet_network_lib.h
gnunet/src/util/os_installation.c
Log:
-cleanup
Modified: gnunet/src/include/gnunet_gns_service.h
===================================================================
--- gnunet/src/include/gnunet_gns_service.h 2012-07-20 20:17:19 UTC (rev
22810)
+++ gnunet/src/include/gnunet_gns_service.h 2012-07-20 20:18:49 UTC (rev
22811)
@@ -116,6 +116,7 @@
GNUNET_GNS_RECORD_REV = GNUNET_NAMESTORE_TYPE_REV
};
+
/**
* Initialize the connection with the GNS service.
*
@@ -169,13 +170,14 @@
*/
struct GNUNET_GNS_LookupRequest*
GNUNET_GNS_lookup (struct GNUNET_GNS_Handle *handle,
- const char * name,
- enum GNUNET_GNS_RecordType type,
- int only_cached,
- struct GNUNET_CRYPTO_RsaPrivateKey *shorten_key,
- GNUNET_GNS_LookupResultProcessor proc,
- void *proc_cls);
+ const char * name,
+ enum GNUNET_GNS_RecordType type,
+ int only_cached,
+ struct GNUNET_CRYPTO_RsaPrivateKey *shorten_key,
+ GNUNET_GNS_LookupResultProcessor proc,
+ void *proc_cls);
+
/**
* Perform an asynchronous lookup operation on the GNS
* in the zone specified by 'zone'.
@@ -193,13 +195,13 @@
*/
struct GNUNET_GNS_LookupRequest*
GNUNET_GNS_lookup_zone (struct GNUNET_GNS_Handle *handle,
- const char * name,
- struct GNUNET_CRYPTO_ShortHashCode *zone,
- enum GNUNET_GNS_RecordType type,
- int only_cached,
- struct GNUNET_CRYPTO_RsaPrivateKey *shorten_key,
- GNUNET_GNS_LookupResultProcessor proc,
- void *proc_cls);
+ const char * name,
+ struct GNUNET_CRYPTO_ShortHashCode *zone,
+ enum GNUNET_GNS_RecordType type,
+ int only_cached,
+ struct GNUNET_CRYPTO_RsaPrivateKey *shorten_key,
+ GNUNET_GNS_LookupResultProcessor proc,
+ void *proc_cls);
/**
@@ -221,7 +223,7 @@
* @param short_name the shortened name or NULL if no result
*/
typedef void (*GNUNET_GNS_ShortenResultProcessor) (void *cls,
- const char* short_name);
+ const char* short_name);
/**
@@ -274,6 +276,7 @@
void
GNUNET_GNS_cancel_shorten_request (struct GNUNET_GNS_ShortenRequest *sr);
+
/* *************** Standard API: get authority ******************* */
@@ -285,7 +288,7 @@
* @param auth_name the name of the auhtority or NULL
*/
typedef void (*GNUNET_GNS_GetAuthResultProcessor) (void *cls,
- const char* short_name);
+ const char* short_name);
/**
@@ -299,9 +302,9 @@
*/
struct GNUNET_GNS_GetAuthRequest*
GNUNET_GNS_get_authority (struct GNUNET_GNS_Handle *handle,
- const char * name,
- GNUNET_GNS_GetAuthResultProcessor proc,
- void *proc_cls);
+ const char * name,
+ GNUNET_GNS_GetAuthResultProcessor proc,
+ void *proc_cls);
/**
Modified: gnunet/src/include/gnunet_network_lib.h
===================================================================
--- gnunet/src/include/gnunet_network_lib.h 2012-07-20 20:17:19 UTC (rev
22810)
+++ gnunet/src/include/gnunet_network_lib.h 2012-07-20 20:18:49 UTC (rev
22811)
@@ -197,7 +197,7 @@
ssize_t
GNUNET_NETWORK_socket_recvfrom (const struct GNUNET_NETWORK_Handle *desc,
void *buffer, size_t length,
- struct sockaddr *src_addr, socklen_t *
addrlen);
+ struct sockaddr *src_addr, socklen_t *addrlen);
/**
Modified: gnunet/src/util/os_installation.c
===================================================================
--- gnunet/src/util/os_installation.c 2012-07-20 20:17:19 UTC (rev 22810)
+++ gnunet/src/util/os_installation.c 2012-07-20 20:18:49 UTC (rev 22811)
@@ -194,29 +194,26 @@
const char *path;
char *p;
char *s;
- int i;
+ unsigned int i;
int c;
- p = NULL;
c = _dyld_image_count ();
for (i = 0; i < c; i++)
{
- if (_dyld_get_image_header (i) == &_mh_dylib_header)
- {
- path = _dyld_get_image_name (i);
- if ( (NULL != path) && (strlen (path) > 0) )
- {
- p = GNUNET_strdup (path);
- s = p + strlen (p);
- while ((s > p) && ('/' != *s))
- s--;
- s++;
- *s = '\0';
- }
- break;
- }
+ if (_dyld_get_image_header (i) != &_mh_dylib_header)
+ continue;
+ path = _dyld_get_image_name (i);
+ if ( (NULL == path) || (0 == strlen (path)) )
+ continue;
+ p = GNUNET_strdup (path);
+ s = p + strlen (p);
+ while ((s > p) && ('/' != *s))
+ s--;
+ s++;
+ *s = '\0';
+ return p;
}
- return p;
+ return NULL;
}
#endif
@@ -237,8 +234,7 @@
char *buf;
const char *p;
- p = getenv ("PATH");
- if (NULL == p)
+ if (NULL == (p = getenv ("PATH")))
return NULL;
#if WINDOWS
/* On W32 look in CWD first. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r22811 - in gnunet/src: include util,
gnunet <=