X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aft.c;h=0b07fa17145bcabfb48a0dc2ac3d277b62ece897;hb=70de5747997ee637dba6f817abccc56ec1340875;hp=4845a5441610c77897be8f500298914637d3010c;hpb=371b9f4aa3b16935f410a40e7ede4e43e63f87e6;p=paraslash.git diff --git a/aft.c b/aft.c index 4845a544..0b07fa17 100644 --- a/aft.c +++ b/aft.c @@ -69,7 +69,7 @@ int load_afsi(struct afs_info *afsi, struct osl_object *obj) { char *buf = obj->data; if (obj->size < AFSI_SIZE) - return -E_BAD_AFS; + return -E_BAD_AFSI; afsi->last_played = read_u64(buf + AFSI_LAST_PLAYED_OFFSET); afsi->attributes = read_u64(buf + AFSI_ATTRIBUTES_OFFSET); afsi->num_played = read_u32(buf + AFSI_NUM_PLAYED_OFFSET); @@ -1269,7 +1269,7 @@ static int com_add_callback(const struct osl_object *query, objs[AFTCOL_PATH].data = path; objs[AFTCOL_PATH].size = strlen(path) + 1; - PARA_DEBUG_LOG("request to add %s with hash %s\n", path, asc); + PARA_INFO_LOG("request to add %s\n", path); hs = find_hash_sister(hash); ret = aft_get_row_of_path(path, &pb); if (ret < 0 && ret != -E_RB_KEY_NOT_FOUND) @@ -1329,14 +1329,14 @@ static int com_add_callback(const struct osl_object *query, const void *row = pb? pb : hs; /* update afhi and chunk_table */ if (flags & ADD_FLAG_VERBOSE) - PARA_NOTICE_LOG("updating audio format handler info (%zd bytes)\n", + PARA_DEBUG_LOG("updating audio format handler info (%zd bytes)\n", objs[AFTCOL_AFHI].size); ret = osl_update_object(audio_file_table, row, AFTCOL_AFHI, &objs[AFTCOL_AFHI]); if (ret < 0) return ret; if (flags & ADD_FLAG_VERBOSE) - PARA_NOTICE_LOG("updating chunk table\n"); + PARA_DEBUG_LOG("updating chunk table\n"); ret = osl_update_object(audio_file_table, row, AFTCOL_CHUNKS, &objs[AFTCOL_CHUNKS]); if (ret < 0) @@ -1704,6 +1704,7 @@ err: void aft_shutdown(enum osl_close_flags flags) { osl_close_table(audio_file_table, flags); + audio_file_table = NULL; } /**