extern const char *status_item_list[NUM_STAT_ITEMS];
extern struct misc_meta_data *mmd;
extern struct gengetopt_args_info conf;
extern const char *status_item_list[NUM_STAT_ITEMS];
extern struct misc_meta_data *mmd;
extern struct gengetopt_args_info conf;
status_item_list[SI_STATUS_BAR], bar ? bar : "(none)",
status_item_list[SI_STATUS], status,
status_item_list[SI_STATUS_FLAGS], flags,
status_item_list[SI_STATUS_BAR], bar ? bar : "(none)",
status_item_list[SI_STATUS], status,
status_item_list[SI_STATUS_FLAGS], flags,
status_item_list[SI_OFFSET], offset,
status_item_list[SI_FORMAT], audio_format_name(nmmd->audio_format),
status_item_list[SI_OFFSET], offset,
status_item_list[SI_FORMAT], audio_format_name(nmmd->audio_format),
- status_item_list[SI_STREAM_START], nmmd->stream_start.tv_sec,
- nmmd->stream_start.tv_usec,
+ status_item_list[SI_STREAM_START],
+ (long unsigned)nmmd->stream_start.tv_sec,
+ (long unsigned)nmmd->stream_start.tv_usec,
const char *subcmds[] = {"add", "delete", "allow", "deny", "on", "off", NULL};
scd->sender_num = -1;
const char *subcmds[] = {"add", "delete", "allow", "deny", "on", "off", NULL};
scd->sender_num = -1;
char *msg = NULL;
for (i = 0; senders[i].name; i++) {
char *tmp = make_message("%s%s\n",
char *msg = NULL;
for (i = 0; senders[i].name; i++) {
char *tmp = make_message("%s%s\n",
- char *selectors = NULL, *sender_info = NULL, *sender_list = NULL;
- struct mallinfo mi = mallinfo();
+ char *selector_string = NULL, *sender_info = NULL, *sender_list = NULL;
- for (i = 0; dblist[i].name; i++) {
- selectors = para_strcat(selectors, dblist[i].name);
- selectors = para_strcat(selectors, " ");
+ for (i = 0; selectors[i].name; i++) {
+ selector_string = para_strcat(selector_string, selectors[i].name);
+ selector_string = para_strcat(selector_string, " ");
return -E_COMMAND_SYNTAX;
return send_buffer(socket_fd, "para_server-" VERSION ", \"" CODENAME "\"\n"
COPYRIGHT "\n"
return -E_COMMAND_SYNTAX;
return send_buffer(socket_fd, "para_server-" VERSION ", \"" CODENAME "\"\n"
COPYRIGHT "\n"
static struct server_command *get_cmd_ptr(char *name, char **handler)
{
struct server_command *cmd = cmd_struct;
static struct server_command *get_cmd_ptr(char *name, char **handler)
{
struct server_command *cmd = cmd_struct;
- *handler = make_message("the %s selector", dblist[mmd->dbt_num].name);
- cmd = dblist[mmd->dbt_num].cmd_list;
+ *handler = make_message("the %s selector",
+ selectors[mmd->selector_num].name);
+ cmd = selectors[mmd->selector_num].cmd_list;
/* no argument given, print list of commands */
if ((ret = send_description(fd, cmd_struct, "server", 0)) < 0)
return ret;
mmd_lock();
/* no argument given, print list of commands */
if ((ret = send_description(fd, cmd_struct, "server", 0)) < 0)
return ret;
mmd_lock();
mmd_unlock();
ret = send_description(fd, cmd, handler, 0);
free(handler);
mmd_unlock();
ret = send_description(fd, cmd, handler, 0);
free(handler);
return -E_COMMAND_SYNTAX;
kill(getppid(), SIGTERM);
return 1;
}
return -E_COMMAND_SYNTAX;
kill(getppid(), SIGTERM);
return 1;
}
- for (i = 0; dblist[i].name; i++) {
- if (strcmp(dblist[i].name, argv[1]))
+ for (i = 0; selectors[i].name; i++) {
+ if (strcmp(selectors[i].name, argv[1]))
return -E_COMMAND_SYNTAX;
if (!(ret = sscanf(argv[1], "%u%c", &i, &c)))
return -E_COMMAND_SYNTAX;
return -E_COMMAND_SYNTAX;
if (!(ret = sscanf(argv[1], "%u%c", &i, &c)))
return -E_COMMAND_SYNTAX;
return -E_COMMAND_SYNTAX;
if (sscanf(argv[1], "%lu", &i) <= 0)
return -E_COMMAND_SYNTAX;
return -E_COMMAND_SYNTAX;
if (sscanf(argv[1], "%lu", &i) <= 0)
return -E_COMMAND_SYNTAX;