return ret;
}
-static void com_ls_callback(int fd, const struct osl_object *query)
+static int com_ls_callback(int fd, const struct osl_object *query)
{
struct ls_options *opts = query->data;
char *p, *pattern_start = (char *)query->data + sizeof(*opts);
if (ret < 0)
goto out;
if (opts->num_matching_paths == 0) {
- if (opts->num_patterns > 0)
- para_printf(&b, "no matches\n");
+ ret = opts->num_patterns > 0? -E_NO_MATCH : 0;
goto out;
}
ret = sort_matching_paths(opts);
free(opts->data);
free(opts->data_ptr);
free(opts->patterns);
+ return ret;
}
/*
*/
int com_ls(struct command_context *cc)
{
- int i, ret;
+ int i;
unsigned flags = 0;
enum ls_sorting_method sort = LS_SORT_BY_PATH;
enum ls_listing_mode mode = LS_MODE_SHORT;
opts.sorting = sort;
opts.mode = mode;
opts.num_patterns = cc->argc - i;
- ret = send_option_arg_callback_request(&query, opts.num_patterns,
+ return send_option_arg_callback_request(&query, opts.num_patterns,
cc->argv + i, com_ls_callback, afs_cb_result_handler, cc);
- return ret;
}
/**
ADD_FLAG_ALL = 8,
};
-static void com_add_callback(int fd, const struct osl_object *query)
+static int com_add_callback(int fd, const struct osl_object *query)
{
char *buf = query->data, *path;
struct osl_row *pb, *aft_row;
afs_event(AUDIO_FILE_ADD, &msg, aft_row);
out:
if (ret < 0)
- para_printf(&msg, "%s\n", para_strerror(-ret));
+ para_printf(&msg, "could not add %s\n", path);
flush_and_free_pb(&msg);
+ return ret;
}
/** Used by com_add(). */
uint32_t flags;
};
-static void path_brother_callback(int fd, const struct osl_object *query)
+static int path_brother_callback(int fd, const struct osl_object *query)
{
char *path = query->data;
struct osl_row *path_brother;
int ret = aft_get_row_of_path(path, &path_brother);
if (ret < 0)
- return;
- pass_buffer_as_shm(fd, SBD_OUTPUT, (char *)&path_brother,
+ return ret;
+ return pass_buffer_as_shm(fd, SBD_OUTPUT, (char *)&path_brother,
sizeof(path_brother));
}
-static void hash_sister_callback(int fd, const struct osl_object *query)
+static int hash_sister_callback(int fd, const struct osl_object *query)
{
unsigned char *hash = query->data;
struct osl_row *hash_sister;
hash_sister = find_hash_sister(hash);
if (!hash_sister)
- return;
- pass_buffer_as_shm(fd, SBD_OUTPUT, (char *)&hash_sister,
+ return 0;
+ return pass_buffer_as_shm(fd, SBD_OUTPUT, (char *)&hash_sister,
sizeof(hash_sister));
}
__a_unused uint8_t band, void *private)
{
struct osl_row **row = private;
- *row = *(struct osl_row **)(result->data);
+
+ if (band == SBD_OUTPUT)
+ *row = *(struct osl_row **)(result->data);
return 1;
}
return 1;
}
-static void com_touch_callback(int fd, const struct osl_object *query)
+static int com_touch_callback(int fd, const struct osl_object *query)
{
struct touch_action_data tad = {.cto = query->data,
.pb = {
else if (pmd.num_matches == 0)
para_printf(&tad.pb, "no matches\n");
flush_and_free_pb(&tad.pb);
+ return 0;
}
int com_touch(struct command_context *cc)
return ret;
}
-static void com_rm_callback(int fd, const struct osl_object *query)
+static int com_rm_callback(int fd, const struct osl_object *query)
{
struct com_rm_action_data crd = {.flags = *(uint32_t *)query->data,
.pb = {
ret = for_each_matching_row(&pmd);
if (ret < 0) {
para_printf(&crd.pb, "%s\n", para_strerror(-ret));
- return;
+ return 0;
}
if ((pmd.num_matches == 0) && !(crd.flags & RM_FLAG_FORCE))
para_printf(&crd.pb, "no matches -- nothing removed\n");
else if (crd.flags & RM_FLAG_VERBOSE)
para_printf(&crd.pb, "removed %u files\n", pmd.num_matches);
flush_and_free_pb(&crd.pb);
+ return 0;
}
/* TODO options: -r (recursive) */
return 1;
}
-static void com_cpsi_callback(int fd, const struct osl_object *query)
+static int com_cpsi_callback(int fd, const struct osl_object *query)
{
struct cpsi_action_data cad = {
.flags = *(unsigned *)query->data,
} else
para_printf(&cad.pb, "no matches - nothing copied\n");
flush_and_free_pb(&cad.pb);
+ return 0;
}
int com_cpsi(struct command_context *cc)
return 1;
}
-static void com_setatt_callback(int fd, const struct osl_object *query)
+static int com_setatt_callback(int fd, const struct osl_object *query)
{
char *p;
int ret;
if (ret < 0)
para_printf(&cad.pb, "%s\n", para_strerror(-ret));
flush_and_free_pb(&cad.pb);
+ return 0;
}
int com_setatt(struct command_context *cc)
com_setatt_callback, afs_cb_result_handler, cc);
}
-static void afs_stat_callback(int fd, const struct osl_object *query)
+static int afs_stat_callback(int fd, const struct osl_object *query)
{
int *parser_friendly = query->data;
char *buf = *parser_friendly?
parser_friendly_status_items : status_items;
if (!buf)
- return;
- pass_buffer_as_shm(fd, SBD_OUTPUT, buf, strlen(buf));
+ return 0;
+ return pass_buffer_as_shm(fd, SBD_OUTPUT, buf, strlen(buf));
}
/**
* \param fd The afs socket.
* \param query Unused.
*
- * This function always succeeds.
+ * \return This function always returns zero.
*
* \sa com_check().
*/
-void aft_check_callback(int fd, __a_unused const struct osl_object *query)
+int aft_check_callback(int fd, __a_unused const struct osl_object *query)
{
struct para_buffer pb = {
.max_size = shm_get_shmmax(),
para_printf(&pb, "checking audio file table...\n");
audio_file_loop(&pb, check_audio_file);
flush_and_free_pb(&pb);
+ return 0;
}
/**