From 07c7c81772c4b60b7980880847f3b21455a0f3c9 Mon Sep 17 00:00:00 2001 From: snowdrop Date: Tue, 10 Jan 2006 11:29:04 +0000 Subject: indent with 'indent -nut -bli0 -fca -npcs' command --- nanohttp/nanohttp-common.c | 382 ++++++++++++++++++++++----------------------- 1 file changed, 191 insertions(+), 191 deletions(-) (limited to 'nanohttp/nanohttp-common.c') diff --git a/nanohttp/nanohttp-common.c b/nanohttp/nanohttp-common.c index 7d7b141..3dcee6b 100644 --- a/nanohttp/nanohttp-common.c +++ b/nanohttp/nanohttp-common.c @@ -1,5 +1,5 @@ /****************************************************************** -* $Id: nanohttp-common.c,v 1.21 2006/01/10 11:21:55 snowdrop Exp $ +* $Id: nanohttp-common.c,v 1.22 2006/01/10 11:29:05 snowdrop Exp $ * * CSOAP Project: A http client/server library in C * Copyright (C) 2003 Ferhat Ayaz @@ -50,24 +50,24 @@ extern int SSLCertLess; /* option stuff */ void -hoption_set (int opt, const char *value) +hoption_set(int opt, const char *value) { if (opt >= MAX_OPTION_SIZE) { - log_warn3 ("Option to high (%d >= %d)", opt, MAX_OPTION_SIZE); + log_warn3("Option to high (%d >= %d)", opt, MAX_OPTION_SIZE); return; } - strncpy (_hoption_table[opt], value, MAX_OPTION_VALUE_SIZE); + strncpy(_hoption_table[opt], value, MAX_OPTION_VALUE_SIZE); } char * -hoption_get (int opt) +hoption_get(int opt) { if (opt >= MAX_OPTION_SIZE) { - log_warn3 ("Option to high (%d >= %d)", opt, MAX_OPTION_SIZE); + log_warn3("Option to high (%d >= %d)", opt, MAX_OPTION_SIZE); return ""; } @@ -76,59 +76,59 @@ hoption_get (int opt) void -hoption_init_args (int argc, char *argv[]) +hoption_init_args(int argc, char *argv[]) { int i; - hoption_set (HOPTION_TMP_DIR, "."); /* default value */ + hoption_set(HOPTION_TMP_DIR, "."); /* default value */ /* initialize from arguments */ for (i = 0; i < argc; i++) { - if (!strcmp (argv[i], NHTTP_ARG_TMPDIR) && i < argc - 1) + if (!strcmp(argv[i], NHTTP_ARG_TMPDIR) && i < argc - 1) { - hoption_set (HOPTION_TMP_DIR, argv[i + 1]); + hoption_set(HOPTION_TMP_DIR, argv[i + 1]); } - else if (!strcmp (argv[i], NHTTP_ARG_LOGFILE) && i < argc - 1) + else if (!strcmp(argv[i], NHTTP_ARG_LOGFILE) && i < argc - 1) { - log_set_file (argv[i + 1]); + log_set_file(argv[i + 1]); } - else if (!strcmp (argv[i], NHTTP_ARG_CERT) && i < argc - 1) + else if (!strcmp(argv[i], NHTTP_ARG_CERT) && i < argc - 1) { #ifndef HAVE_SSL - fprintf (stderr, - "WARNING: csoap compiled without '--with-ssl' flag. Parameter '%s' is disabled", - NHTTP_ARG_CERT); + fprintf(stderr, + "WARNING: csoap compiled without '--with-ssl' flag. Parameter '%s' is disabled", + NHTTP_ARG_CERT); #else SSLCert = argv[i + 1]; #endif } - else if (!strcmp (argv[i], NHTTP_ARG_CERTPASS) && i < argc - 1) + else if (!strcmp(argv[i], NHTTP_ARG_CERTPASS) && i < argc - 1) { #ifndef HAVE_SSL - fprintf (stderr, - "WARNING: csoap compiled without '--with-ssl' flag. Parameter '%s' is disabled", - NHTTP_ARG_CERTPASS); + fprintf(stderr, + "WARNING: csoap compiled without '--with-ssl' flag. Parameter '%s' is disabled", + NHTTP_ARG_CERTPASS); #else SSLPass = argv[i + 1]; #endif } - else if (!strcmp (argv[i], NHTTP_ARG_CA) && i < argc - 1) + else if (!strcmp(argv[i], NHTTP_ARG_CA) && i < argc - 1) { #ifndef HAVE_SSL - fprintf (stderr, - "WARNING: csoap compiled without '--with-ssl' flag. Parameter '%s' is disabled", - NHTTP_ARG_CA); + fprintf(stderr, + "WARNING: csoap compiled without '--with-ssl' flag. Parameter '%s' is disabled", + NHTTP_ARG_CA); #else SSLCA = argv[i + 1]; #endif } - else if (!strcmp (argv[i], NHTTP_ARG_HTTPS)) + else if (!strcmp(argv[i], NHTTP_ARG_HTTPS)) { #ifndef HAVE_SSL - fprintf (stderr, - "WARNING: csoap compiled without '--with-ssl' flag. Parameter '%s' is disabled", - NHTTP_ARG_HTTPS); + fprintf(stderr, + "WARNING: csoap compiled without '--with-ssl' flag. Parameter '%s' is disabled", + NHTTP_ARG_HTTPS); #else SSLCertLess = 1; #endif @@ -144,13 +144,13 @@ hoption_init_args (int argc, char *argv[]) /* not thread safe!*/ char * -VisualC_funcname (const char *file, int line) +VisualC_funcname(const char *file, int line) { static char buffer[256]; - int i = strlen (file) - 1; + int i = strlen(file) - 1; while (i > 0 && file[i] != '\\') i--; - sprintf (buffer, "%s:%d", (file[i] != '\\') ? file : (file + i + 1), line); + sprintf(buffer, "%s:%d", (file[i] != '\\') ? file : (file + i + 1), line); return buffer; } @@ -166,23 +166,23 @@ typedef struct _herror_impl_t herror_t -herror_new (const char *func, int errcode, const char *format, ...) +herror_new(const char *func, int errcode, const char *format, ...) { va_list ap; - herror_impl_t *impl = (herror_impl_t *) malloc (sizeof (herror_impl_t)); + herror_impl_t *impl = (herror_impl_t *) malloc(sizeof(herror_impl_t)); impl->errcode = errcode; - strcpy (impl->func, func); - va_start (ap, format); - vsprintf (impl->message, format, ap); - va_end (ap); + strcpy(impl->func, func); + va_start(ap, format); + vsprintf(impl->message, format, ap); + va_end(ap); return (herror_t) impl; } int -herror_code (herror_t err) +herror_code(herror_t err) { herror_impl_t *impl = (herror_impl_t *) err; if (!err) @@ -191,7 +191,7 @@ herror_code (herror_t err) } char * -herror_func (herror_t err) +herror_func(herror_t err) { herror_impl_t *impl = (herror_impl_t *) err; if (!err) @@ -200,7 +200,7 @@ herror_func (herror_t err) } char * -herror_message (herror_t err) +herror_message(herror_t err) { herror_impl_t *impl = (herror_impl_t *) err; if (!err) @@ -209,12 +209,12 @@ herror_message (herror_t err) } void -herror_release (herror_t err) +herror_release(herror_t err) { herror_impl_t *impl = (herror_impl_t *) err; if (!err) return; - free (impl); + free(impl); } @@ -224,7 +224,7 @@ static char logfile[75] = { '\0' }; static int log_background = 0; log_level_t -log_set_level (log_level_t level) +log_set_level(log_level_t level) { log_level_t old = loglevel; loglevel = level; @@ -233,29 +233,29 @@ log_set_level (log_level_t level) log_level_t -log_get_level () +log_get_level() { return loglevel; } void -log_set_file (const char *filename) +log_set_file(const char *filename) { if (filename) - strncpy (logfile, filename, 75); + strncpy(logfile, filename, 75); else logfile[0] = '\0'; } void -log_set_background (int state) +log_set_background(int state) { log_background = state; } char * -log_get_file () +log_get_file() { if (logfile[0] == '\0') return NULL; @@ -263,8 +263,8 @@ log_get_file () } static void -log_write (log_level_t level, const char *prefix, - const char *func, const char *format, va_list ap) +log_write(log_level_t level, const char *prefix, + const char *func, const char *format, va_list ap) { char buffer[1054]; char buffer2[1054]; @@ -273,84 +273,84 @@ log_write (log_level_t level, const char *prefix, if (level < loglevel) return; - if (!log_background || log_get_file ()) + if (!log_background || log_get_file()) { #ifdef WIN32 - sprintf (buffer, "*%s*: [%s] %s\n", prefix, func, format); + sprintf(buffer, "*%s*: [%s] %s\n", prefix, func, format); #else - sprintf (buffer, "*%s*:(%d) [%s] %s\n", - prefix, pthread_self (), func, format); + sprintf(buffer, "*%s*:(%d) [%s] %s\n", + prefix, pthread_self(), func, format); #endif - vsprintf (buffer2, buffer, ap); + vsprintf(buffer2, buffer, ap); if (!log_background) { - printf (buffer2); - fflush (stdout); + printf(buffer2); + fflush(stdout); } - if (log_get_file ()) + if (log_get_file()) { - f = fopen (log_get_file (), "a"); + f = fopen(log_get_file(), "a"); if (!f) - f = fopen (log_get_file (), "w"); + f = fopen(log_get_file(), "w"); if (f) { - fprintf (f, buffer2); - fflush (f); - fclose (f); + fprintf(f, buffer2); + fflush(f); + fclose(f); } } } } void -log_verbose (const char *FUNC, const char *format, ...) +log_verbose(const char *FUNC, const char *format, ...) { va_list ap; - va_start (ap, format); - log_write (HLOG_VERBOSE, "VERBOSE", FUNC, format, ap); - va_end (ap); + va_start(ap, format); + log_write(HLOG_VERBOSE, "VERBOSE", FUNC, format, ap); + va_end(ap); } void -log_debug (const char *FUNC, const char *format, ...) +log_debug(const char *FUNC, const char *format, ...) { va_list ap; - va_start (ap, format); - log_write (HLOG_DEBUG, "DEBUG", FUNC, format, ap); - va_end (ap); + va_start(ap, format); + log_write(HLOG_DEBUG, "DEBUG", FUNC, format, ap); + va_end(ap); } void -log_info (const char *FUNC, const char *format, ...) +log_info(const char *FUNC, const char *format, ...) { va_list ap; - va_start (ap, format); - log_write (HLOG_INFO, "INFO", FUNC, format, ap); - va_end (ap); + va_start(ap, format); + log_write(HLOG_INFO, "INFO", FUNC, format, ap); + va_end(ap); } void -log_warn (const char *FUNC, const char *format, ...) +log_warn(const char *FUNC, const char *format, ...) { va_list ap; - va_start (ap, format); - log_write (HLOG_WARN, "WARN", FUNC, format, ap); - va_end (ap); + va_start(ap, format); + log_write(HLOG_WARN, "WARN", FUNC, format, ap); + va_end(ap); } void -log_error (const char *FUNC, const char *format, ...) +log_error(const char *FUNC, const char *format, ...) { va_list ap; - va_start (ap, format); - log_write (HLOG_ERROR, "ERROR", FUNC, format, ap); - va_end (ap); + va_start(ap, format); + log_write(HLOG_ERROR, "ERROR", FUNC, format, ap); + va_end(ap); } @@ -358,7 +358,7 @@ log_error (const char *FUNC, const char *format, ...) FUNCTION: strcmpigcase ------------------------------------------*/ int -strcmpigcase (const char *s1, const char *s2) +strcmpigcase(const char *s1, const char *s2) { int l1, l2, i; @@ -367,14 +367,14 @@ strcmpigcase (const char *s1, const char *s2) if (s1 == NULL || s2 == NULL) return 0; - l1 = strlen (s1); - l2 = strlen (s2); + l1 = strlen(s1); + l2 = strlen(s2); if (l1 != l2) return 0; for (i = 0; i < l1; i++) - if (toupper (s1[i]) != toupper (s2[i])) + if (toupper(s1[i]) != toupper(s2[i])) return 0; return 1; @@ -382,17 +382,17 @@ strcmpigcase (const char *s1, const char *s2) hpair_t * -hpairnode_new (const char *key, const char *value, hpair_t * next) +hpairnode_new(const char *key, const char *value, hpair_t * next) { hpair_t *pair; - log_verbose3 ("new pair ('%s','%s')", SAVE_STR (key), SAVE_STR (value)); - pair = (hpair_t *) malloc (sizeof (hpair_t)); + log_verbose3("new pair ('%s','%s')", SAVE_STR(key), SAVE_STR(value)); + pair = (hpair_t *) malloc(sizeof(hpair_t)); if (key != NULL) { - pair->key = (char *) malloc (strlen (key) + 1); - strcpy (pair->key, key); + pair->key = (char *) malloc(strlen(key) + 1); + strcpy(pair->key, key); } else { @@ -401,8 +401,8 @@ hpairnode_new (const char *key, const char *value, hpair_t * next) if (value != NULL) { - pair->value = (char *) malloc (strlen (value) + 1); - strcpy (pair->value, value); + pair->value = (char *) malloc(strlen(value) + 1); + strcpy(pair->value, value); } else { @@ -415,63 +415,63 @@ hpairnode_new (const char *key, const char *value, hpair_t * next) } hpair_t * -hpairnode_parse (const char *str, const char *delim, hpair_t * next) +hpairnode_parse(const char *str, const char *delim, hpair_t * next) { hpair_t *pair; char *key, *value; int c; - pair = (hpair_t *) malloc (sizeof (hpair_t)); + pair = (hpair_t *) malloc(sizeof(hpair_t)); pair->key = ""; pair->value = ""; pair->next = next; - key = strtok_r ((char *) str, delim, &value); + key = strtok_r((char *) str, delim, &value); if (key != NULL) { - pair->key = (char *) malloc (strlen (key) + 1); - strcpy (pair->key, key); + pair->key = (char *) malloc(strlen(key) + 1); + strcpy(pair->key, key); } if (value != NULL) { for (c = 0; value[c] == ' '; c++); /* skip white space */ - pair->value = (char *) malloc (strlen (&value[c]) + 1); - strcpy (pair->value, &value[c]); + pair->value = (char *) malloc(strlen(&value[c]) + 1); + strcpy(pair->value, &value[c]); } return pair; } hpair_t * -hpairnode_copy (const hpair_t * src) +hpairnode_copy(const hpair_t * src) { hpair_t *pair; if (src == NULL) return NULL; - pair = hpairnode_new (src->key, src->value, NULL); + pair = hpairnode_new(src->key, src->value, NULL); return pair; } hpair_t * -hpairnode_copy_deep (const hpair_t * src) +hpairnode_copy_deep(const hpair_t * src) { hpair_t *pair, *result, *next; if (src == NULL) return NULL; - result = hpairnode_copy (src); + result = hpairnode_copy(src); next = src->next; pair = result; while (next != NULL) { - pair->next = hpairnode_copy (next); + pair->next = hpairnode_copy(next); pair = pair->next; next = next->next; } @@ -481,75 +481,75 @@ hpairnode_copy_deep (const hpair_t * src) void -hpairnode_dump (hpair_t * pair) +hpairnode_dump(hpair_t * pair) { if (pair == NULL) { - log_verbose1 ("(NULL)[]"); + log_verbose1("(NULL)[]"); return; } - log_verbose5 ("(%p)['%s','%s','%p']", pair, - SAVE_STR (pair->key), SAVE_STR (pair->value), pair->next); + log_verbose5("(%p)['%s','%s','%p']", pair, + SAVE_STR(pair->key), SAVE_STR(pair->value), pair->next); } void -hpairnode_dump_deep (hpair_t * pair) +hpairnode_dump_deep(hpair_t * pair) { hpair_t *p; p = pair; - log_verbose1 ("-- BEGIN dump hpairnode_t --"); + log_verbose1("-- BEGIN dump hpairnode_t --"); while (p != NULL) { - hpairnode_dump (p); + hpairnode_dump(p); p = p->next; } - log_verbose1 ("-- END dump hpairnode_t --\n"); + log_verbose1("-- END dump hpairnode_t --\n"); } void -hpairnode_free (hpair_t * pair) +hpairnode_free(hpair_t * pair) { if (pair == NULL) return; - free (pair->key); - free (pair->value); + free(pair->key); + free(pair->value); - free (pair); + free(pair); } void -hpairnode_free_deep (hpair_t * pair) +hpairnode_free_deep(hpair_t * pair) { hpair_t *tmp; while (pair != NULL) { tmp = pair->next; - hpairnode_free (pair); + hpairnode_free(pair); pair = tmp; } } char * -hpairnode_get_ignore_case (hpair_t * pair, const char *key) +hpairnode_get_ignore_case(hpair_t * pair, const char *key) { if (key == NULL) { - log_error1 ("key is NULL"); + log_error1("key is NULL"); return NULL; } while (pair != NULL) { if (pair->key != NULL) { - if (strcmpigcase (pair->key, key)) + if (strcmpigcase(pair->key, key)) { return pair->value; } @@ -561,18 +561,18 @@ hpairnode_get_ignore_case (hpair_t * pair, const char *key) } char * -hpairnode_get (hpair_t * pair, const char *key) +hpairnode_get(hpair_t * pair, const char *key) { if (key == NULL) { - log_error1 ("key is NULL"); + log_error1("key is NULL"); return NULL; } while (pair != NULL) { if (pair->key != NULL) { - if (!strcmp (pair->key, key)) + if (!strcmp(pair->key, key)) { return pair->value; } @@ -584,23 +584,23 @@ hpairnode_get (hpair_t * pair, const char *key) } static void -hurl_dump (const hurl_t * url) +hurl_dump(const hurl_t * url) { if (url == NULL) { - log_error1 ("url is NULL!"); + log_error1("url is NULL!"); return; } - log_verbose2 ("PROTOCOL : %d", url->protocol); - log_verbose2 (" HOST : %s", url->host); - log_verbose2 (" PORT : %d", url->port); - log_verbose2 (" CONTEXT : %s", url->context); + log_verbose2("PROTOCOL : %d", url->protocol); + log_verbose2(" HOST : %s", url->host); + log_verbose2(" PORT : %d", url->port); + log_verbose2(" CONTEXT : %s", url->context); } herror_t -hurl_parse (hurl_t * url, const char *urlstr) +hurl_parse(hurl_t * url, const char *urlstr) { int iprotocol; int ihost; @@ -611,7 +611,7 @@ hurl_parse (hurl_t * url, const char *urlstr) char protocol[1024]; iprotocol = 0; - len = strlen (urlstr); + len = strlen(urlstr); /* find protocol */ while (urlstr[iprotocol] != ':' && urlstr[iprotocol] != '\0') @@ -621,19 +621,19 @@ hurl_parse (hurl_t * url, const char *urlstr) if (iprotocol == 0) { - log_error1 ("no protocol"); - return herror_new ("hurl_parse", URL_ERROR_NO_PROTOCOL, "No protocol"); + log_error1("no protocol"); + return herror_new("hurl_parse", URL_ERROR_NO_PROTOCOL, "No protocol"); } if (iprotocol + 3 >= len) { - log_error1 ("no host"); - return herror_new ("hurl_parse", URL_ERROR_NO_HOST, "No host"); + log_error1("no host"); + return herror_new("hurl_parse", URL_ERROR_NO_HOST, "No host"); } if (urlstr[iprotocol] != ':' && urlstr[iprotocol + 1] != '/' && urlstr[iprotocol + 2] != '/') { - log_error1 ("no protocol"); - return herror_new ("hurl_parse", URL_ERROR_NO_PROTOCOL, "No protocol"); + log_error1("no protocol"); + return herror_new("hurl_parse", URL_ERROR_NO_PROTOCOL, "No protocol"); } /* find host */ ihost = iprotocol + 3; @@ -645,8 +645,8 @@ hurl_parse (hurl_t * url, const char *urlstr) if (ihost == iprotocol + 1) { - log_error1 ("no host"); - return herror_new ("hurl_parse", URL_ERROR_NO_HOST, "No host"); + log_error1("no host"); + return herror_new("hurl_parse", URL_ERROR_NO_HOST, "No host"); } /* find port */ iport = ihost; @@ -662,29 +662,29 @@ hurl_parse (hurl_t * url, const char *urlstr) } /* find protocol */ - strncpy (protocol, urlstr, iprotocol); + strncpy(protocol, urlstr, iprotocol); protocol[iprotocol] = '\0'; - if (strcmpigcase (protocol, "http")) + if (strcmpigcase(protocol, "http")) url->protocol = PROTOCOL_HTTP; - else if (strcmpigcase (protocol, "https")) + else if (strcmpigcase(protocol, "https")) url->protocol = PROTOCOL_HTTPS; - else if (strcmpigcase (protocol, "ftp")) + else if (strcmpigcase(protocol, "ftp")) url->protocol = PROTOCOL_FTP; else - return herror_new ("hurl_parse", - URL_ERROR_UNKNOWN_PROTOCOL, "Unknown protocol '%s'", - protocol); + return herror_new("hurl_parse", + URL_ERROR_UNKNOWN_PROTOCOL, "Unknown protocol '%s'", + protocol); /* TODO (#1#): add max of size and URL_MAX_HOST_SIZE */ size = ihost - iprotocol - 3; - strncpy (url->host, &urlstr[iprotocol + 3], size); + strncpy(url->host, &urlstr[iprotocol + 3], size); url->host[size] = '\0'; if (iport > ihost) { size = iport - ihost; - strncpy (tmp, &urlstr[ihost + 1], size); - url->port = atoi (tmp); + strncpy(tmp, &urlstr[ihost + 1], size); + url->port = atoi(tmp); } else { @@ -702,12 +702,12 @@ hurl_parse (hurl_t * url, const char *urlstr) } } - len = strlen (urlstr); + len = strlen(urlstr); if (len > iport) { /* TODO (#1#): find max of size and URL_MAX_CONTEXT_SIZE */ size = len - iport; - strncpy (url->context, &urlstr[iport], size); + strncpy(url->context, &urlstr[iport], size); url->context[size] = '\0'; } else @@ -715,7 +715,7 @@ hurl_parse (hurl_t * url, const char *urlstr) url->context[0] = '\0'; } - hurl_dump (url); + hurl_dump(url); return H_OK; } @@ -724,7 +724,7 @@ hurl_parse (hurl_t * url, const char *urlstr) /* Content-type stuff */ content_type_t * -content_type_new (const char *content_type_str) +content_type_new(const char *content_type_str) { hpair_t *pair = NULL, *last = NULL; content_type_t *ct; @@ -735,10 +735,10 @@ content_type_new (const char *content_type_str) /* Create object */ - ct = (content_type_t *) malloc (sizeof (content_type_t)); + ct = (content_type_t *) malloc(sizeof(content_type_t)); ct->params = NULL; - len = strlen (content_type_str); + len = strlen(content_type_str); while (i <= len) { if (i != len) @@ -784,7 +784,7 @@ content_type_new (const char *content_type_str) { value[c] = '\0'; - pair = hpairnode_new (key, value, NULL); + pair = hpairnode_new(key, value, NULL); if (ct->params == NULL) ct->params = pair; else @@ -810,43 +810,43 @@ content_type_new (const char *content_type_str) void -content_type_free (content_type_t * ct) +content_type_free(content_type_t * ct) { if (!ct) return; - hpairnode_free_deep (ct->params); - free (ct); + hpairnode_free_deep(ct->params); + free(ct); } part_t * -part_new (const char *id, const char *filename, - const char *content_type, const char *transfer_encoding, - part_t * next) +part_new(const char *id, const char *filename, + const char *content_type, const char *transfer_encoding, + part_t * next) { - part_t *part = (part_t *) malloc (sizeof (part_t)); + part_t *part = (part_t *) malloc(sizeof(part_t)); part->header = NULL; part->next = next; part->deleteOnExit = 0; - strcpy (part->id, id); - strcpy (part->filename, filename); + strcpy(part->id, id); + strcpy(part->filename, filename); if (content_type) - strcpy (part->content_type, content_type); + strcpy(part->content_type, content_type); else part->content_type[0] = '\0'; - part->header = hpairnode_new (HEADER_CONTENT_ID, id, part->header); + part->header = hpairnode_new(HEADER_CONTENT_ID, id, part->header); /* TODO (#1#): encoding is always binary. implement also others! */ /* part->header = hpairnode_new(HEADER_CONTENT_TRANSFER_ENCODING, "binary", part->header);*/ - strcpy (part->transfer_encoding, - transfer_encoding ? transfer_encoding : "binary"); + strcpy(part->transfer_encoding, + transfer_encoding ? transfer_encoding : "binary"); if (content_type) { part->header = - hpairnode_new (HEADER_CONTENT_TYPE, content_type, part->header); + hpairnode_new(HEADER_CONTENT_TYPE, content_type, part->header); } else { @@ -857,26 +857,26 @@ part_new (const char *id, const char *filename, } void -part_free (part_t * part) +part_free(part_t * part) { if (part == NULL) return; if (part->deleteOnExit) { - remove (part->filename); + remove(part->filename); } - hpairnode_free_deep (part->header); + hpairnode_free_deep(part->header); - free (part); + free(part); } attachments_t * -attachments_new () /* should be used internally */ +attachments_new() /* should be used internally */ { attachments_t *attachments = - (attachments_t *) malloc (sizeof (attachments_t)); + (attachments_t *) malloc(sizeof(attachments_t)); attachments->parts = NULL; attachments->last = NULL; attachments->root_part = NULL; @@ -885,7 +885,7 @@ attachments_new () /* should be used internally */ } void -attachments_add_part (attachments_t * attachments, part_t * part) +attachments_add_part(attachments_t * attachments, part_t * part) { /* paranoya check */ if (!attachments) @@ -903,7 +903,7 @@ attachments_add_part (attachments_t * attachments, part_t * part) Free a mime message */ void -attachments_free (attachments_t * message) +attachments_free(attachments_t * message) { part_t *tmp, *part; @@ -914,14 +914,14 @@ attachments_free (attachments_t * message) while (part) { tmp = part->next; - part_free (part); + part_free(part); part = tmp; } if (message->root_part) - part_free (message->root_part); + part_free(message->root_part); /* TODO (#1#): HERE IS A BUG!!!! */ - free (message); + free(message); } @@ -929,7 +929,7 @@ attachments_free (attachments_t * message) /* strtok_r() */ char * -strtok_r (char *s, const char *delim, char **save_ptr) +strtok_r(char *s, const char *delim, char **save_ptr) { char *token; @@ -937,16 +937,16 @@ strtok_r (char *s, const char *delim, char **save_ptr) s = *save_ptr; /* Scan leading delimiters. */ - s += strspn (s, delim); + s += strspn(s, delim); if (*s == '\0') return NULL; /* Find the end of the token. */ token = s; - s = strpbrk (token, delim); + s = strpbrk(token, delim); if (s == NULL) /* This token finishes the string. */ - *save_ptr = strchr (token, '\0'); + *save_ptr = strchr(token, '\0'); else { /* Terminate the token and make *SAVE_PTR point past it. */ @@ -958,13 +958,13 @@ strtok_r (char *s, const char *delim, char **save_ptr) /* localtime_r() */ struct tm * -localtime_r (const time_t * const timep, struct tm *p_tm) +localtime_r(const time_t * const timep, struct tm *p_tm) { static struct tm *tmp; - tmp = localtime (timep); + tmp = localtime(timep); if (tmp) { - memcpy (p_tm, tmp, sizeof (struct tm)); + memcpy(p_tm, tmp, sizeof(struct tm)); tmp = p_tm; } return tmp; -- cgit v1.1-32-gdbae