command_util.sh: rename proto to header and array to c_file

diff --git a/Makefile.in b/Makefile.in
index bb0488082d4d3a0d4b328aa7fb0d38c22f6ce8c3..aef0c0c95b2b6d4984c586906e84196612a3a292 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -149,29 +149,29 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
                --set-version="$V"  < $<
 
 server_command_list.c: server.cmd server_command_list.h
-       ./command_util.sh array < $< >>$@
+       ./command_util.sh c_file < $< >>$@
 server_command_list.h: server.cmd
-       ./command_util.sh proto < $< >> $@
+       ./command_util.sh header < $< >> $@
 
 mysql_selector_command_list.c: mysql_selector.cmd mysql_selector_command_list.h
-       ./command_util.sh array < $< >>$@
+       ./command_util.sh c_file < $< >>$@
 mysql_selector_command_list.h: mysql_selector.cmd
-       ./command_util.sh proto < $< >> $@
+       ./command_util.sh header < $< >> $@
 
 random_selector_command_list.c: random_selector.cmd random_selector_command_list.h
-       ./command_util.sh array < $< >>$@
+       ./command_util.sh c_file < $< >>$@
 random_selector_command_list.h: random_selector.cmd
-       ./command_util.sh proto < $< >> $@
+       ./command_util.sh header < $< >> $@
 
 playlist_selector_command_list.c: playlist_selector.cmd playlist_selector_command_list.h
-       ./command_util.sh array < $< >>$@
+       ./command_util.sh c_file < $< >>$@
 playlist_selector_command_list.h: playlist_selector.cmd
-       ./command_util.sh proto < $< >> $@
+       ./command_util.sh header < $< >> $@
 
 audiod_command_list.c: audiod.cmd audiod_command_list.h
-       ./command_util.sh array < $< >>$@
+       ./command_util.sh c_file < $< >>$@
 audiod_command_list.h: audiod.cmd
-       ./command_util.sh proto < $< >> $@
+       ./command_util.sh header < $< >> $@
 
 ortp_recv.o: ortp_recv.c
        $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) @ortp_cppflags@ $<

diff --git a/command_util.sh b/command_util.sh
index b757b2e0d29741097e649aeca38bd889b7541e70..25fc0884f009afa15ebded0bbf813475afea1d1a 100755 (executable)
--- a/command_util.sh
+++ b/command_util.sh
@@ -178,7 +178,7 @@ com_man()
        done
 }
 
-com_array()
+com_c_file()
 {
        echo "/** \file $file_name.c $c_file_comment */"
        echo "$includes"
@@ -221,7 +221,7 @@ dump_proto()
        echo
 }
 
-com_proto()
+com_header()
 {
        echo "/** \file $file_name.h $header_comment */"
        echo
@@ -242,11 +242,11 @@ read_header
 arg="$1"
 shift
 case "$arg" in
-       "array")
-               com_array
+       "c_file")
+               com_c_file
                ;;
-       "proto")
-               com_proto
+       "header")
+               com_header
                ;;
        "man")
                com_man $*