diff options
| -rw-r--r-- | src/include/taler_mhd_lib.h | 24 | ||||
| -rw-r--r-- | src/mhd/mhd_config.c | 39 | ||||
| -rw-r--r-- | src/mhd/mhd_legal.c | 11 |
3 files changed, 37 insertions, 37 deletions
diff --git a/src/include/taler_mhd_lib.h b/src/include/taler_mhd_lib.h index b57239f44..7100ad95c 100644 --- a/src/include/taler_mhd_lib.h +++ b/src/include/taler_mhd_lib.h @@ -54,8 +54,7 @@ enum TALER_MHD_GlobalOptions /** - * Set global options for response generation - * within libtalermhd. + * Set global options for response generation within libtalermhd. * * @param go global options to use */ @@ -64,9 +63,8 @@ TALER_MHD_setup (enum TALER_MHD_GlobalOptions go); /** - * Add headers we want to return in every response. - * Useful for testing, like if we want to always close - * connections. + * Add headers we want to return in every response. Useful for testing, like + * if we want to always close connections. * * @param response response to modify */ @@ -372,11 +370,10 @@ TALER_MHD_open_unix_path (const char *unix_path, /** - * Bind a listen socket to the UNIX domain path - * or the TCP port and IP address as specified - * in @a cfg in section @a section. IF only a - * port was specified, set @a port and return -1. - * Otherwise, return the bound file descriptor. + * Bind a listen socket to the UNIX domain path or the TCP port and IP address + * as specified in @a cfg in section @a section. IF only a port was + * specified, set @a port and return -1. Otherwise, return the bound file + * descriptor. * * @param cfg configuration to parse * @param section configuration section to use @@ -398,10 +395,9 @@ struct TALER_MHD_Legal; /** - * Load set of legal documents as specified in - * @a cfg in section @a section where the Etag - * is given under the @param tagoption and the - * directory under the @a diroption. + * Load set of legal documents as specified in @a cfg in section @a section + * where the Etag is given under the @param tagoption and the directory under + * the @a diroption. * * @param cfg configuration to use * @param section section to load values from diff --git a/src/mhd/mhd_config.c b/src/mhd/mhd_config.c index 128e1c273..8ee29ed0e 100644 --- a/src/mhd/mhd_config.c +++ b/src/mhd/mhd_config.c @@ -49,25 +49,30 @@ TALER_MHD_parse_config (const struct GNUNET_CONFIGURATION_Handle *cfg, char **unix_path, mode_t *unix_mode) { - const char *choices[] = {"tcp", "unix"}; + const char *choices[] = { + "tcp", + "unix", + NULL + }; const char *serve_type; unsigned long long port; if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_choice (cfg, section, - "serve", + "SERVE", choices, &serve_type)) { GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, section, - "serve", - "serve type required"); + "SERVE", + "serve type (tcp or unix) required"); return GNUNET_SYSERR; } - if (0 == strcasecmp (serve_type, "tcp")) + if (0 == strcasecmp (serve_type, + "tcp")) { if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg, @@ -77,7 +82,7 @@ TALER_MHD_parse_config (const struct GNUNET_CONFIGURATION_Handle *cfg, { GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, section, - "port", + "PORT", "port number required"); return GNUNET_SYSERR; } @@ -87,15 +92,16 @@ TALER_MHD_parse_config (const struct GNUNET_CONFIGURATION_Handle *cfg, { GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, section, - "port", - "value not in [1,65535]"); + "PORT", + "port number not in [1,65535]"); return GNUNET_SYSERR; } *rport = (uint16_t) port; *unix_path = NULL; return GNUNET_OK; } - if (0 == strcmp (serve_type, "unix")) + if (0 == strcmp (serve_type, + "unix")) { struct sockaddr_un s_un; char *modestring; @@ -103,13 +109,13 @@ TALER_MHD_parse_config (const struct GNUNET_CONFIGURATION_Handle *cfg, if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, section, - "unixpath", + "UNIXPATH", unix_path)) { GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, section, - "unixpath", - "unixpath required"); + "UNIXPATH", + "UNIXPATH value required"); return GNUNET_SYSERR; } if (strlen (*unix_path) >= sizeof (s_un.sun_path)) @@ -291,11 +297,10 @@ TALER_MHD_open_unix_path (const char *unix_path, /** - * Bind a listen socket to the UNIX domain path - * or the TCP port and IP address as specified - * in @a cfg in section @a section. IF only a - * port was specified, set @a port and return -1. - * Otherwise, return the bound file descriptor. + * Bind a listen socket to the UNIX domain path or the TCP port and IP address + * as specified in @a cfg in section @a section. IF only a port was + * specified, set @a port and return -1. Otherwise, return the bound file + * descriptor. * * @param cfg configuration to parse * @param section configuration section to use diff --git a/src/mhd/mhd_legal.c b/src/mhd/mhd_legal.c index 2ad1497c6..f99289a2f 100644 --- a/src/mhd/mhd_legal.c +++ b/src/mhd/mhd_legal.c @@ -148,8 +148,8 @@ language_matches (const char *language_pattern, /** - * Generate a response with a legal document in - * the format and language of the user's choosing. + * Generate a response with a legal document in the format and language of the + * user's choosing. * * @param conn HTTP connection to handle * @param legal legal document to serve @@ -507,10 +507,9 @@ load_language (struct TALER_MHD_Legal *legal, /** - * Load set of legal documents as specified in - * @a cfg in section @a section where the Etag - * is given under the @param tagoption and the - * directory under the @a diroption. + * Load set of legal documents as specified in @a cfg in section @a section + * where the Etag is given under the @param tagoption and the directory under + * the @a diroption. * * @param cfg configuration to use * @param section section to load values from |