[FFmpeg-cvslog] r16853 - in trunk/libavutil: Makefile avstring.c string.c

[diego]

Author: diego
Date: Thu Jan 29 23:12:36 2009
New Revision: 16853

Log:
Rename string.c to avstring.c so that the name of header and C file match.

Added:
   trunk/libavutil/avstring.c   (props changed)
      - copied unchanged from r16851, trunk/libavutil/string.c
Deleted:
   trunk/libavutil/string.c
Modified:
   trunk/libavutil/Makefile

Modified: trunk/libavutil/Makefile
==============================================================================
--- trunk/libavutil/Makefile	Thu Jan 29 23:08:32 2009	(r16852)
+++ trunk/libavutil/Makefile	Thu Jan 29 23:12:36 2009	(r16853)
@@ -21,6 +21,7 @@ HEADERS = adler32.h                     
 
 OBJS = adler32.o                                                        \
        aes.o                                                            \
+       avstring.o                                                       \
        base64.o                                                         \
        crc.o                                                            \
        des.o                                                            \
@@ -37,7 +38,6 @@ OBJS = adler32.o                        
        rational.o                                                       \
        rc4.o                                                            \
        sha1.o                                                           \
-       string.o                                                         \
        tree.o                                                           \
        utils.o                                                          \
 

Copied: trunk/libavutil/avstring.c (from r16851, trunk/libavutil/string.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/libavutil/avstring.c	Thu Jan 29 23:12:36 2009	(r16853, copy of r16851, trunk/libavutil/string.c)
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
+ * Copyright (c) 2007 Mans Rullgard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include "avstring.h"
+
+int av_strstart(const char *str, const char *pfx, const char **ptr)
+{
+    while (*pfx && *pfx == *str) {
+        pfx++;
+        str++;
+    }
+    if (!*pfx && ptr)
+        *ptr = str;
+    return !*pfx;
+}
+
+int av_stristart(const char *str, const char *pfx, const char **ptr)
+{
+    while (*pfx && toupper((unsigned)*pfx) == toupper((unsigned)*str)) {
+        pfx++;
+        str++;
+    }
+    if (!*pfx && ptr)
+        *ptr = str;
+    return !*pfx;
+}
+
+size_t av_strlcpy(char *dst, const char *src, size_t size)
+{
+    size_t len = 0;
+    while (++len < size && *src)
+        *dst++ = *src++;
+    if (len <= size)
+        *dst = 0;
+    return len + strlen(src) - 1;
+}
+
+size_t av_strlcat(char *dst, const char *src, size_t size)
+{
+    size_t len = strlen(dst);
+    if (size <= len + 1)
+        return len + strlen(src);
+    return len + av_strlcpy(dst + len, src, size - len);
+}
+
+size_t av_strlcatf(char *dst, size_t size, const char *fmt, ...)
+{
+    int len = strlen(dst);
+    va_list vl;
+
+    va_start(vl, fmt);
+    len += vsnprintf(dst + len, size > len ? size - len : 0, fmt, vl);
+    va_end(vl);
+
+    return len;
+}