From 26301cb80611652efbdbf80b77f9de73b488421d Mon Sep 17 00:00:00 2001 From: Måns Rullgård Date: Sat, 23 Jun 2007 00:21:06 +0000 Subject: simplify pstrcpy() Originally committed as revision 9391 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/cutils.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'libavformat') diff --git a/libavformat/cutils.c b/libavformat/cutils.c index bde1c1d39a..55257a5a01 100644 --- a/libavformat/cutils.c +++ b/libavformat/cutils.c @@ -75,19 +75,12 @@ int stristart(const char *str, const char *val, const char **ptr) */ void pstrcpy(char *buf, int buf_size, const char *str) { - int c; - char *q = buf; - if (buf_size <= 0) return; - for(;;) { - c = *str++; - if (c == 0 || q >= buf + buf_size - 1) - break; - *q++ = c; - } - *q = '\0'; + while (buf_size-- > 1 && *str) + *buf++ = *str++; + *buf = 0; } /* strcat and truncate. */ -- cgit v1.2.3