X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=string.c;h=c228c24c4f27eee753349e361afd1d70708aa2b4;hp=77f2f2a17d27002b0fcf608a4b615f6beaa83b01;hb=ffb2eaa90429f6d5c3d369509efcdf91c5463dad;hpb=f113a41a633c0541f0d8418baf40205f4553c885 diff --git a/string.c b/string.c index 77f2f2a1..c228c24c 100644 --- a/string.c +++ b/string.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2009 Andre Noll + * Copyright (C) 2004-2010 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -135,6 +135,13 @@ __must_check __printf_1_2 __malloc char *make_message(const char *fmt, ...) return msg; } +/** + * Free the content of a pointer and set it to \p NULL. + * + * This is equivalent to "free(*arg); *arg = NULL;". + * + * \param arg The pointer whose content should be freed. + */ void freep(void *arg) { void **ptr = (void **)arg; @@ -393,7 +400,9 @@ int for_each_line_ro(char *buf, size_t size, line_handler_t *line_handler, private_data); } +/** Return the hex characters of the lower 4 bits. */ #define hex(a) (hexchar[(a) & 15]) + static void write_size_header(char *buf, int n) { static char hexchar[] = "0123456789abcdef"; @@ -405,6 +414,17 @@ static void write_size_header(char *buf, int n) buf[4] = ' '; } +/** + * Read a four-byte hex-number and return its value. + * + * Each status item sent by para_server is prefixed with such a hex number in + * ASCII which describes the size of the status item. + * + * \param buf The buffer which must be at least four bytes long. + * + * \return The value of the hex number on success, \p -E_SIZE_PREFIX if the + * buffer did not contain only hex digits. + */ int read_size_header(const char *buf) { int i, len = 0; @@ -501,9 +521,9 @@ __printf_2_3 int para_printf(struct para_buffer *b, const char *fmt, ...) } } -/** \cond LLONG_MAX and LLONG_LIN might not be defined. */ +/** \cond LLONG_MAX and LLONG_MIN might not be defined. */ #ifndef LLONG_MAX -#define LLONG_MAX (1 << (sizeof(long) - 1)) +#define LLONG_MAX 9223372036854775807LL #endif #ifndef LLONG_MIN #define LLONG_MIN (-LLONG_MAX - 1LL) @@ -743,6 +763,17 @@ err: return ret; } +/** + * Compile a regular expression. + * + * This simple wrapper calls regcomp() and logs a message on errors. + * + * \param preg See regcomp(3). + * \param regex See regcomp(3). + * \param cflags See regcomp(3). + * + * \return Standard. + */ int para_regcomp(regex_t *preg, const char *regex, int cflags) { char *buf;