update to gengetopt-2.17

gengetopt-2.17 has an improved help management, thanks again to Lorenzo
Bettini for implementing my suggestions. The help texts of the options
are contained in an array which is defined in xyz.cmdline.c and declared
as extern in xyz.cmdline.h.

In order to link more than one xyz.cmdline.o into a single binary,
these arrays must have different names. So use the --arg-struct-name
option of gengetopt for each receiver/filter.

diff --git a/Makefile.in b/Makefile.in
index ee550de4e5e99c9f8d4a5556aa4ad2a878f3cce9..42ab70ec0ad22a5d29af33e66715005e7d4f861f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -129,11 +129,13 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
 
 %_recv.cmdline.h %_recv.cmdline.c: %_recv.ggo
        gengetopt $(module_ggo_opts) \
 
 %_recv.cmdline.h %_recv.cmdline.c: %_recv.ggo
        gengetopt $(module_ggo_opts) \

+               --arg-struct-name=$(subst .ggo,,$<)_args_info \

                --file-name=$(subst .ggo,,$<).cmdline \
                --func-name $(subst .ggo,,$<)_cmdline_parser < $<
 
 %_filter.cmdline.h %_filter.cmdline.c: %_filter.ggo
        gengetopt $(module_ggo_opts) \
                --file-name=$(subst .ggo,,$<).cmdline \
                --func-name $(subst .ggo,,$<)_cmdline_parser < $<
 
 %_filter.cmdline.h %_filter.cmdline.c: %_filter.ggo
        gengetopt $(module_ggo_opts) \

+               --arg-struct-name=$(subst .ggo,,$<)_args_info \

                --file-name=$(subst .ggo,,$<).cmdline \
                --func-name $(subst _filter.ggo,,$<)_cmdline_parser < $<
 
                --file-name=$(subst .ggo,,$<).cmdline \
                --func-name $(subst _filter.ggo,,$<)_cmdline_parser < $<
 

diff --git a/NEWS b/NEWS
index ec27bc6715a6574e16c4e8c3e711cca873316d37..b1e73d4a8847a266431bf33c870fccbb7bf09359 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,8 @@ NEWS
 
        o update to libortp-0.9.1
 
 
        o update to libortp-0.9.1
 

+       o update to gengetopt-2.17
+

 
 0.2.11 (2006-03-11) "atomic duality"
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 0.2.11 (2006-03-11) "atomic duality"
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/compress.c b/compress.c
index b7ddc28534106eede2ba8b7e6ad1b1d60a3b5510..de5448fb9eb9f5ebb33f7dffaf58ec246e270a31 100644 (file)
--- a/compress.c
+++ b/compress.c
@@ -36,7 +36,7 @@ struct private_compress_data {
        /** the current multiplier */
        unsigned current_gain;
        /** points to the configuration data for this instance of the compress filter */
        /** the current multiplier */
        unsigned current_gain;
        /** points to the configuration data for this instance of the compress filter */

-       struct gengetopt_args_info *conf;
+       struct compress_filter_args_info *conf;

        /** minimal admissible gain */
        unsigned min_gain;
        /** maximal admissible gain */
        /** minimal admissible gain */
        unsigned min_gain;
        /** maximal admissible gain */


@@ -111,7 +111,7 @@ static void close_compress(struct filter_node *fn)
 
 static void *compress_parse_config(int argc, char **argv)
 {
 
 static void *compress_parse_config(int argc, char **argv)
 {

-       struct gengetopt_args_info *ret = para_calloc(sizeof(struct gengetopt_args_info));
+       struct compress_filter_args_info *ret = para_calloc(sizeof(struct compress_filter_args_info));

        if (!compress_cmdline_parser(argc, argv, ret))
                return ret;
        free(ret);
        if (!compress_cmdline_parser(argc, argv, ret))
                return ret;
        free(ret);

diff --git a/dccp_recv.c b/dccp_recv.c
index 1ef1a31d8b865efbaf1c73f5ed042a59730026d0..679eb227e170c1b7f08792f9f5b9700e3ae842e5 100644 (file)
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -68,7 +68,7 @@ static void dccp_recv_close(struct receiver_node *rn)
 static int dccp_recv_open(struct receiver_node *rn)
 {
        struct private_dccp_recv_data *pdd;
 static int dccp_recv_open(struct receiver_node *rn)
 {
        struct private_dccp_recv_data *pdd;

-       struct gengetopt_args_info *conf = rn->conf;
+       struct dccp_recv_args_info *conf = rn->conf;

        int ret;
        struct addrinfo *ai;
        char *tmp;
        int ret;
        struct addrinfo *ai;
        char *tmp;


@@ -108,7 +108,7 @@ static void dccp_shutdown(void)
 
 static void *dccp_recv_parse_config(int argc, char **argv)
 {
 
 static void *dccp_recv_parse_config(int argc, char **argv)
 {

-       struct gengetopt_args_info *tmp = para_calloc(sizeof(struct gengetopt_args_info));
+       struct dccp_recv_args_info *tmp = para_calloc(sizeof(struct dccp_recv_args_info));

 
        if (!dccp_recv_cmdline_parser(argc, argv, tmp))
                return tmp;
 
        if (!dccp_recv_cmdline_parser(argc, argv, tmp))
                return tmp;

diff --git a/http_recv.c b/http_recv.c
index 2e1d467b0a20b4b5dccf7f23b3724f7d3c942d4b..da28faaaecd2bb19948d96a3606310c3cb9fbb84 100644 (file)
--- a/http_recv.c
+++ b/http_recv.c
@@ -156,7 +156,7 @@ static void http_recv_close(struct receiver_node *rn)
 
 static void *http_recv_parse_config(int argc, char **argv)
 {
 
 static void *http_recv_parse_config(int argc, char **argv)
 {

-       struct gengetopt_args_info *tmp = para_calloc(sizeof(struct gengetopt_args_info));
+       struct http_recv_args_info *tmp = para_calloc(sizeof(struct http_recv_args_info));

 
        if (!http_recv_cmdline_parser(argc, argv, tmp))
                return tmp;
 
        if (!http_recv_cmdline_parser(argc, argv, tmp))
                return tmp;


@@ -168,7 +168,7 @@ static int http_recv_open(struct receiver_node *rn)
 {
        struct private_http_recv_data *phd;
        struct hostent *he;
 {
        struct private_http_recv_data *phd;
        struct hostent *he;

-       struct gengetopt_args_info *conf = rn->conf;
+       struct http_recv_args_info *conf = rn->conf;

        struct sockaddr_in their_addr;
        int ret;
 
        struct sockaddr_in their_addr;
        int ret;
 

diff --git a/oggdec.c b/oggdec.c
index d6c8f1121f0cf11f3289e4ba64cbf713f99950aa..714d620e7adb06a414e5eba3a0d3fe55cef476b8 100644 (file)
--- a/oggdec.c
+++ b/oggdec.c
@@ -98,7 +98,7 @@ static void ogg_open(struct filter_node *fn)
 {
        struct private_oggdec_data *pod = para_calloc(
                sizeof(struct private_oggdec_data));
 {
        struct private_oggdec_data *pod = para_calloc(
                sizeof(struct private_oggdec_data));

-       struct gengetopt_args_info *conf = fn->conf;
+       struct oggdec_filter_args_info *conf = fn->conf;

 
        fn->private_data = pod;
        fn->bufsize = conf->bufsize_arg * 1024;
 
        fn->private_data = pod;
        fn->bufsize = conf->bufsize_arg * 1024;


@@ -125,7 +125,7 @@ static ssize_t ogg_convert(char *inbuffer, size_t len, struct filter_node *fn)
 {
        ssize_t ret;
        struct private_oggdec_data *pod = fn->private_data;
 {
        ssize_t ret;
        struct private_oggdec_data *pod = fn->private_data;

-       struct gengetopt_args_info *conf = fn->conf;
+       struct oggdec_filter_args_info *conf = fn->conf;

        /* make the buffer known to the read callback cb_read() */
        pod->inbuf = inbuffer;
        pod->inbuf_len = len;
        /* make the buffer known to the read callback cb_read() */
        pod->inbuf = inbuffer;
        pod->inbuf_len = len;


@@ -174,7 +174,7 @@ again:
 
 static void *oggdec_parse_config(int argc, char **argv)
 {
 
 static void *oggdec_parse_config(int argc, char **argv)
 {

-       struct gengetopt_args_info *ret = para_calloc(sizeof(struct gengetopt_args_info));
+       struct oggdec_filter_args_info *ret = para_calloc(sizeof(struct oggdec_filter_args_info));

        if (!oggdec_cmdline_parser(argc, argv, ret))
                return ret;
        free(ret);
        if (!oggdec_cmdline_parser(argc, argv, ret))
                return ret;
        free(ret);

diff --git a/ortp_recv.c b/ortp_recv.c
index 4df8e3a5af040521c8c8fd38fed97a22e042382b..1e440420a2e78b49a81b7d387dc8eaf3a1fd2d36 100644 (file)
--- a/ortp_recv.c
+++ b/ortp_recv.c
@@ -234,7 +234,7 @@ static void *ortp_recv_parse_config(int argc, char **argv)
 {
        int ret;
 
 {
        int ret;
 

-       struct gengetopt_args_info *tmp = para_calloc(sizeof(struct gengetopt_args_info));
+       struct ortp_recv_args_info *tmp = para_calloc(sizeof(struct ortp_recv_args_info));

 
        ret = ortp_recv_cmdline_parser(argc, argv, tmp)? -E_ORTP_SYNTAX : 1;
        if (ret > 0)
 
        ret = ortp_recv_cmdline_parser(argc, argv, tmp)? -E_ORTP_SYNTAX : 1;
        if (ret > 0)


@@ -246,7 +246,7 @@ static void *ortp_recv_parse_config(int argc, char **argv)
 static int ortp_recv_open(struct receiver_node *rn)
 {
        struct private_ortp_recv_data *pord;
 static int ortp_recv_open(struct receiver_node *rn)
 {
        struct private_ortp_recv_data *pord;

-       struct gengetopt_args_info *conf = rn->conf;
+       struct ortp_recv_args_info *conf = rn->conf;

 
        rn->buf = para_calloc(CHUNK_SIZE);
 
 
        rn->buf = para_calloc(CHUNK_SIZE);