X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=afs.c;h=050e1965cb68e71257c109d35b6ae23671c56949;hb=3946a9e571327a8a56ab40196ad867df38b70d27;hp=d9cddeb87b356103164bee70ddf2534122c7923a;hpb=742be1f7334570492615fdf89ce46123e3f71886;p=paraslash.git diff --git a/afs.c b/afs.c index d9cddeb8..050e1965 100644 --- a/afs.c +++ b/afs.c @@ -366,8 +366,8 @@ int for_each_matching_row(struct pattern_match_data *pmd) */ int string_compare(const struct osl_object *obj1, const struct osl_object *obj2) { - const char *str1 = (const char *)obj1->data; - const char *str2 = (const char *)obj2->data; + const char *str1 = obj1->data; + const char *str2 = obj2->data; return strncmp(str1, str2, PARA_MIN(obj1->size, obj2->size)); } @@ -424,7 +424,8 @@ static int open_next_audio_file(void) ret = open_and_update_audio_file(&afd); if (ret < 0) { - PARA_ERROR_LOG("%s\n", para_strerror(-ret)); + if (ret != -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND)) + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); goto no_admissible_files; } shmid = ret; @@ -1043,7 +1044,8 @@ static int com_init_callback(struct afs_callback_arg *aca) } ret = open_afs_tables(); if (ret < 0) - para_printf(&aca->pbout, "cannot open afs tables\n"); + para_printf(&aca->pbout, "cannot open afs tables: %s\n", + para_strerror(-ret)); out: return ret; }