afs_event(AUDIO_FILE_REMOVE, &crd->pb, row);
ret = osl(osl_del_row(audio_file_table, row));
if (ret < 0)
- para_printf(&crd->pb, "%s: %s\n", name, para_strerror(-ret));
+ para_printf(&crd->pb, "cannot remove %s\n", name);
return ret;
}
if (crd.flags & RM_FLAG_FNM_PATHNAME)
pmd.fnmatch_flags |= FNM_PATHNAME;
ret = for_each_matching_row(&pmd);
- if (ret < 0) {
- para_printf(&crd.pb, "%s\n", para_strerror(-ret));
- return 0;
- }
- if ((pmd.num_matches == 0) && !(crd.flags & RM_FLAG_FORCE))
- para_printf(&crd.pb, "no matches -- nothing removed\n");
+ if (ret < 0)
+ goto out;
+ if (pmd.num_matches == 0)
+ ret = -E_NO_MATCH;
else if (crd.flags & RM_FLAG_VERBOSE)
- para_printf(&crd.pb, "removed %u files\n", pmd.num_matches);
+ para_printf(&crd.pb, "removed %u file(s)\n", pmd.num_matches);
+out:
flush_and_free_pb(&crd.pb);
- return 0;
+ return ret;
}
/* TODO options: -r (recursive) */
{
uint32_t flags = 0;
struct osl_object query = {.data = &flags, .size = sizeof(flags)};
- int i, ret;
+ int i;
for (i = 1; i < cc->argc; i++) {
const char *arg = cc->argv[i];
}
if (i >= cc->argc)
return -E_AFT_SYNTAX;
- ret = send_option_arg_callback_request(&query, cc->argc - i,
+ return send_option_arg_callback_request(&query, cc->argc - i,
cc->argv + i, com_rm_callback, afs_cb_result_handler, cc);
- if (ret < 0)
- send_strerror(cc, -ret);
- return ret;
}
/**
if (ret < 0)
goto out;
ret = for_each_matching_row(&pmd);
-out:
if (ret < 0)
- para_printf(&cad.pb, "%s\n", para_strerror(-ret));
- else if (pmd.num_matches > 0) {
+ goto out;
+ if (pmd.num_matches > 0) {
if (cad.flags & CPSI_FLAG_VERBOSE)
- para_printf(&cad.pb, "copied requested afsi from %s "
- "to %u files\n", source_path, pmd.num_matches);
+ para_printf(&cad.pb, "updated afsi of %u file(s)\n",
+ pmd.num_matches);
} else
- para_printf(&cad.pb, "no matches - nothing copied\n");
+ ret = -E_NO_MATCH;
+out:
flush_and_free_pb(&cad.pb);
- return 0;
+ return ret;
}
int com_cpsi(struct command_context *cc)
{
unsigned flags = 0;
- int i, ret;
+ int i;
struct osl_object options = {.data = &flags, .size = sizeof(flags)};
for (i = 1; i < cc->argc; i++) {
return -E_AFT_SYNTAX;
if (!(flags & ~CPSI_FLAG_VERBOSE)) /* no copy flags given */
flags = ~(unsigned)CPSI_FLAG_VERBOSE | flags;
- ret = send_option_arg_callback_request(&options, cc->argc - i,
+ return send_option_arg_callback_request(&options, cc->argc - i,
cc->argv + i, com_cpsi_callback, afs_cb_result_handler, cc);
- if (ret < 0)
- send_strerror(cc, -ret);
- return ret;
}
struct change_atts_data {
if (ret < 0)
goto out;
if (pmd.num_matches == 0)
- para_printf(&cad.pb, "no matches\n");
+ ret = -E_NO_MATCH;
out:
- if (ret < 0)
- para_printf(&cad.pb, "%s\n", para_strerror(-ret));
flush_and_free_pb(&cad.pb);
- return 0;
+ return ret;
}
int com_setatt(struct command_context *cc)
afs_cb_result_handler, cc);
}
-/* returns success even on errors to keep the loop going */
+/* returns success on non-fatal errors to keep the loop going */
static int check_audio_file(struct osl_row *row, void *data)
{
char *path;
if (ret < 0) {
para_printf(pb, "%s\n", para_strerror(-ret));
- return 0;
+ return ret;
}
if (stat(path, &statbuf) < 0)
para_printf(pb, "%s: stat error (%s)\n", path, strerror(errno));
* \param fd The afs socket.
* \param query Unused.
*
- * \return This function always returns zero.
+ * \return Standard. Inconsistencies are reported but not regarded as an error.
*
* \sa com_check().
*/
int aft_check_callback(int fd, __a_unused const struct osl_object *query)
{
+ int ret;
struct para_buffer pb = {
.max_size = shm_get_shmmax(),
.private_data = &(struct afs_max_size_handler_data) {
.max_size_handler = afs_max_size_handler
};
para_printf(&pb, "checking audio file table...\n");
- audio_file_loop(&pb, check_audio_file);
+ ret = audio_file_loop(&pb, check_audio_file);
flush_and_free_pb(&pb);
- return 0;
+ return ret;
}
/**