diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-08-15 21:46:35 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-08-15 21:46:35 +0000 |
commit | 502af2167f7c218366666ca4944bd7cc54b5b19a (patch) | |
tree | a91fec5cc9769d260640bd91c6633cb9cf395524 /src/include/gnunet_common.h | |
parent | 03af5a603b7cc53432249d5854cd412aa90dde0d (diff) | |
download | gnunet-502af2167f7c218366666ca4944bd7cc54b5b19a.tar.gz gnunet-502af2167f7c218366666ca4944bd7cc54b5b19a.zip |
indentation
Diffstat (limited to 'src/include/gnunet_common.h')
-rw-r--r-- | src/include/gnunet_common.h | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h index 7e4f82ad4..036249e34 100644 --- a/src/include/gnunet_common.h +++ b/src/include/gnunet_common.h | |||
@@ -45,7 +45,7 @@ | |||
45 | #ifdef HAVE_STDARG_H | 45 | #ifdef HAVE_STDARG_H |
46 | #include <stdarg.h> | 46 | #include <stdarg.h> |
47 | #endif | 47 | #endif |
48 | 48 | ||
49 | /** | 49 | /** |
50 | * Version of the API (for entire gnunetutil.so library). | 50 | * Version of the API (for entire gnunetutil.so library). |
51 | */ | 51 | */ |
@@ -193,8 +193,7 @@ GNUNET_log_from (enum GNUNET_ErrorType kind, | |||
193 | * @param n number of log calls to ignore | 193 | * @param n number of log calls to ignore |
194 | * @param check_reset GNUNET_YES to assert that the log skip counter is currently zero | 194 | * @param check_reset GNUNET_YES to assert that the log skip counter is currently zero |
195 | */ | 195 | */ |
196 | void | 196 | void GNUNET_log_skip (unsigned int n, int check_reset); |
197 | GNUNET_log_skip (unsigned int n, int check_reset); | ||
198 | 197 | ||
199 | 198 | ||
200 | /** | 199 | /** |
@@ -206,8 +205,7 @@ GNUNET_log_skip (unsigned int n, int check_reset); | |||
206 | * @return GNUNET_OK on success, GNUNET_SYSERR if logfile could not be opened | 205 | * @return GNUNET_OK on success, GNUNET_SYSERR if logfile could not be opened |
207 | */ | 206 | */ |
208 | int | 207 | int |
209 | GNUNET_log_setup (const char *comp, | 208 | GNUNET_log_setup (const char *comp, const char *loglevel, const char *logfile); |
210 | const char *loglevel, const char *logfile); | ||
211 | 209 | ||
212 | 210 | ||
213 | /** | 211 | /** |
@@ -236,7 +234,7 @@ void GNUNET_logger_remove (GNUNET_Logger logger, void *logger_cls); | |||
236 | * @param hc the hash code | 234 | * @param hc the hash code |
237 | * @return string | 235 | * @return string |
238 | */ | 236 | */ |
239 | const char *GNUNET_h2s (const GNUNET_HashCode *hc); | 237 | const char *GNUNET_h2s (const GNUNET_HashCode * hc); |
240 | 238 | ||
241 | 239 | ||
242 | /** | 240 | /** |
@@ -248,7 +246,7 @@ const char *GNUNET_h2s (const GNUNET_HashCode *hc); | |||
248 | * @param hc the hash code | 246 | * @param hc the hash code |
249 | * @return string | 247 | * @return string |
250 | */ | 248 | */ |
251 | const char *GNUNET_h2s_full (const GNUNET_HashCode *hc); | 249 | const char *GNUNET_h2s_full (const GNUNET_HashCode * hc); |
252 | 250 | ||
253 | 251 | ||
254 | /** | 252 | /** |
@@ -273,8 +271,7 @@ const char *GNUNET_i2s (const struct GNUNET_PeerIdentity *pid); | |||
273 | * @return nicely formatted string for the address | 271 | * @return nicely formatted string for the address |
274 | * will be overwritten by next call to GNUNET_a2s. | 272 | * will be overwritten by next call to GNUNET_a2s. |
275 | */ | 273 | */ |
276 | const char *GNUNET_a2s (const struct sockaddr *addr, | 274 | const char *GNUNET_a2s (const struct sockaddr *addr, socklen_t addrlen); |
277 | socklen_t addrlen); | ||
278 | 275 | ||
279 | /** | 276 | /** |
280 | * Convert error type to string. | 277 | * Convert error type to string. |
@@ -515,7 +512,8 @@ void *GNUNET_xmalloc_ (size_t size, const char *filename, int linenumber); | |||
515 | * @param linenumber line where this call is being made (for debugging) | 512 | * @param linenumber line where this call is being made (for debugging) |
516 | * @return allocated memory, never NULL | 513 | * @return allocated memory, never NULL |
517 | */ | 514 | */ |
518 | void *GNUNET_xmemdup_ (const void *buf, size_t size, const char *filename, int linenumber); | 515 | void *GNUNET_xmemdup_ (const void *buf, size_t size, const char *filename, |
516 | int linenumber); | ||
519 | 517 | ||
520 | 518 | ||
521 | /** | 519 | /** |
@@ -569,7 +567,8 @@ char *GNUNET_xstrdup_ (const char *str, const char *filename, int linenumber); | |||
569 | * @param linenumber line where this call is being made (for debugging) | 567 | * @param linenumber line where this call is being made (for debugging) |
570 | * @return the duplicated string | 568 | * @return the duplicated string |
571 | */ | 569 | */ |
572 | char *GNUNET_xstrndup_ (const char *str, size_t len, const char *filename, int linenumber); | 570 | char *GNUNET_xstrndup_ (const char *str, size_t len, const char *filename, |
571 | int linenumber); | ||
573 | 572 | ||
574 | /** | 573 | /** |
575 | * Grow an array, the new elements are zeroed out. | 574 | * Grow an array, the new elements are zeroed out. |
@@ -596,11 +595,11 @@ void GNUNET_xgrow_ (void **old, | |||
596 | 595 | ||
597 | 596 | ||
598 | #if __STDC_VERSION__ < 199901L | 597 | #if __STDC_VERSION__ < 199901L |
599 | # if __GNUC__ >= 2 | 598 | #if __GNUC__ >= 2 |
600 | # define __func__ __FUNCTION__ | 599 | #define __func__ __FUNCTION__ |
601 | # else | 600 | #else |
602 | # define __func__ "<unknown>" | 601 | #define __func__ "<unknown>" |
603 | # endif | 602 | #endif |
604 | #endif | 603 | #endif |
605 | 604 | ||
606 | #endif /*GNUNET_COMMON_H_ */ | 605 | #endif /*GNUNET_COMMON_H_ */ |