nuke the AN (array name) header field

The previous patches changed that name to ${file_name%command_list}cmds,
so it is a derived string that does not need to be specified any more.

diff --git a/audiod.cmd b/audiod.cmd
index a484c9bc0b420adc8af11f740410231c90188780..598a823cd7cdfb40d06c4db09d6d86e0bb2ed1d8 100644 (file)
--- a/audiod.cmd
+++ b/audiod.cmd
@@ -2,7 +2,6 @@ FN: audiod_command_list
 HC: prototypes for the audiod command handlers
 CC: array of audiod commands
 AT: audiod_command
 HC: prototypes for the audiod command handlers
 CC: array of audiod commands
 AT: audiod_command

-AN: audiod_cmds

 IN: list para sched audiod
 ---
 N: cycle
 IN: list para sched audiod
 ---
 N: cycle

diff --git a/command_util.sh b/command_util.sh
index 43f4dba850a92a93b2a0857645d121ca395c7440..1b4376577eb2c542384cba91d4aee95355d89bb0 100755 (executable)
--- a/command_util.sh
+++ b/command_util.sh
@@ -37,13 +37,11 @@ read_header()
                        ;;
                FN:)
                        file_name="$value"
                        ;;
                FN:)
                        file_name="$value"

+                       array_name=${value%command_list}cmds

                        ;;
                AT:)
                        array_type="$value"
                        ;;
                        ;;
                AT:)
                        array_type="$value"
                        ;;

-               AN:)
-                       array_name="$value"
-                       ;;

                IN:)
                        for i in $value; do
                                includes="$includes
                IN:)
                        for i in $value; do
                                includes="$includes

diff --git a/mysql_selector.cmd b/mysql_selector.cmd
index 75be740be79d8130d50e3afbe65ec75c04f03226..ec58ef1eae95793a6b71892b21a938551a0d671c 100644 (file)
--- a/mysql_selector.cmd
+++ b/mysql_selector.cmd
@@ -2,7 +2,6 @@ FN: mysql_selector_command_list
 HC: prototypes for the commands of the mysql audio file selector
 CC: array of commands for the mysql audio file selector
 AT: server_command
 HC: prototypes for the commands of the mysql audio file selector
 CC: array of commands for the mysql audio file selector
 AT: server_command

-AN: mysql_selector_cmds

 IN: server user_list
 ---
 N: cam
 IN: server user_list
 ---
 N: cam

diff --git a/playlist_selector.cmd b/playlist_selector.cmd
index f7253810e902dfd924ee4d7f090709c7dca11945..a6d818cd8ae4209d6665c62cc658952d1a489201 100644 (file)
--- a/playlist_selector.cmd
+++ b/playlist_selector.cmd
@@ -2,7 +2,6 @@ FN: playlist_selector_command_list
 HC: prototypes for the commands of the playlist audio file selector
 CC: array of commands for the playlist audio file selector
 AT: server_command
 HC: prototypes for the commands of the playlist audio file selector
 CC: array of commands for the playlist audio file selector
 AT: server_command

-AN: playlist_selector_cmds

 IN: server user_list
 ---
 N: ppl
 IN: server user_list
 ---
 N: ppl

diff --git a/random_selector.cmd b/random_selector.cmd
index 21dc14383230d24d3db2485f24fa29f965229ddf..8b8ab8495062c25794141721c06bed5c69e32510 100644 (file)
--- a/random_selector.cmd
+++ b/random_selector.cmd
@@ -2,7 +2,6 @@ FN: random_selector_command_list
 HC: prototypes for the commands of the random audio file selector
 CC: array of commands for the random audio file selector
 AT: server_command
 HC: prototypes for the commands of the random audio file selector
 CC: array of commands for the random audio file selector
 AT: server_command

-AN: random_selector_cmds

 IN: server user_list
 ---
 N: random_info
 IN: server user_list
 ---
 N: random_info

diff --git a/server.cmd b/server.cmd
index 9d7c4b08875a4f07333e78fce92701fc307d0db6..b50c9c935ad09cbae4b4bf41fc688f97598487a1 100644 (file)
--- a/server.cmd
+++ b/server.cmd
@@ -2,7 +2,6 @@ FN: server_command_list
 HC: prototypes for the server command handlers
 CC: array of server commands
 AT: server_command
 HC: prototypes for the server command handlers
 CC: array of server commands
 AT: server_command

-AN: server_cmds

 IN: server user_list
 ---
 N: chs
 IN: server user_list
 ---
 N: chs