# HG changeset patch # User aurel # Date 1233617102 0 # Node ID 20a889f18f234849587ac1106691d46adbac6f42 # Parent 3ae604db67e0679c91a8e02c9eba1fdfe359c3ca simplify diff -r 3ae604db67e0 -r 20a889f18f23 aiff.c --- a/aiff.c Mon Feb 02 23:09:39 2009 +0000 +++ b/aiff.c Mon Feb 02 23:25:02 2009 +0000 @@ -81,13 +81,7 @@ /* Metadata string read */ static void get_meta(ByteIOContext *pb, char * str, int strsize, int size) { - int res; - - if (size > strsize-1) - res = get_buffer(pb, (uint8_t*)str, strsize-1); - else - res = get_buffer(pb, (uint8_t*)str, size); - + int res = get_buffer(pb, (uint8_t*)str, FFMIN(strsize-1, size)); if (res < 0) return;