X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=06ff805c7f6ac4f5ec1adb6fa8e827d0a0d49608;hp=aaeab8a39f22abd9e2855eb1d354939c46431111;hb=02691a995a6ee0fe4d9078f1d82465edd4814f74;hpb=f6f50d03a09d6bc423324206d274336e9905bbb4 diff --git a/aft.c b/aft.c index aaeab8a3..06ff805c 100644 --- a/aft.c +++ b/aft.c @@ -2,6 +2,7 @@ #include "error.h" #include #include +#include "afh.h" #include "afs.h" #include "string.h" @@ -724,7 +725,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts, return 1; } if (opts->mode == LS_MODE_VERBOSE) { - HASH_TYPE asc_hash[2 * HASH_SIZE + 1]; + char asc_hash[2 * HASH_SIZE + 1]; char *att_line, *lyrics_line, *image_line; hash_to_asc(d->hash, asc_hash); @@ -1265,7 +1266,7 @@ static int com_add_callback(const struct osl_object *query, char afsi_buf[AFSI_SIZE]; uint32_t flags = read_u32(buf + AFTROW_FLAGS_OFFSET); - hash = buf + AFTROW_HASH_OFFSET; + hash = (HASH_TYPE *)buf + AFTROW_HASH_OFFSET; hash_to_asc(hash, asc);; objs[AFTCOL_HASH].data = buf + AFTROW_HASH_OFFSET; objs[AFTCOL_HASH].size = HASH_SIZE; @@ -1435,7 +1436,7 @@ out_free: return ret; } -int com_add(int fd, int argc, const char **argv) +int com_add(int fd, int argc, char **argv) { int i, ret; struct private_add_data pad = {.fd = fd, .flags = 0};