return p;
}
+#if FF_API_D2STR
char *av_d2str(double d)
{
char *str = av_malloc(16);
snprintf(str, 16, "%f", d);
return str;
}
+#endif
#define WHITESPACES " \n\t\r"
const char *av_basename(const char *path)
{
- char *p = strrchr(path, '/');
-
+ char *p;
#if HAVE_DOS_PATHS
- char *q = strrchr(path, '\\');
- char *d = strchr(path, ':');
+ char *q, *d;
+#endif
+ if (!path || *path == '\0')
+ return ".";
+
+ p = strrchr(path, '/');
+#if HAVE_DOS_PATHS
+ q = strrchr(path, '\\');
+ d = strchr(path, ':');
p = FFMAX3(p, q, d);
#endif
const char *av_dirname(char *path)
{
- char *p = strrchr(path, '/');
+ char *p = path ? strrchr(path, '/') : NULL;
#if HAVE_DOS_PATHS
- char *q = strrchr(path, '\\');
- char *d = strchr(path, ':');
+ char *q = path ? strrchr(path, '\\') : NULL;
+ char *d = path ? strchr(path, ':') : NULL;
d = d ? d + 1 : d;
enum AVEscapeMode mode, int flags)
{
AVBPrint dstbuf;
+ int ret;
- av_bprint_init(&dstbuf, 1, AV_BPRINT_SIZE_UNLIMITED);
+ av_bprint_init(&dstbuf, 1, INT_MAX); /* (int)dstbuf.len must be >= 0 */
av_bprint_escape(&dstbuf, src, special_chars, mode, flags);
if (!av_bprint_is_complete(&dstbuf)) {
av_bprint_finalize(&dstbuf, NULL);
return AVERROR(ENOMEM);
- } else {
- av_bprint_finalize(&dstbuf, dst);
- return dstbuf.len;
}
+ if ((ret = av_bprint_finalize(&dstbuf, dst)) < 0)
+ return ret;
+ return dstbuf.len;
}
int av_match_name(const char *name, const char *names)