Commit bb3244de authored by Reimar Döffinger's avatar Reimar Döffinger Committed by Martin Storsjö

Replace all usage of strcasecmp/strncasecmp

All current usages of it are incompatible with localization.
For example strcasecmp("i", "I") != 0 is possible, but would
break many of the places where it is used.

Instead use our own implementations that always treat the data
as ASCII.
Signed-off-by: default avatarMartin Storsjö <martin@martin.st>
parent ba04ecfd
This diff is collapsed.
......@@ -42,12 +42,12 @@
#include <linux/videodev2.h>
#endif
#include <time.h>
#include <strings.h>
#include "libavutil/imgutils.h"
#include "libavutil/log.h"
#include "libavutil/opt.h"
#include "libavutil/parseutils.h"
#include "libavutil/pixdesc.h"
#include "libavutil/avstring.h"
static const int desired_video_buffers = 256;
......@@ -493,7 +493,7 @@ static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap)
return AVERROR(EIO);
}
if (!strcasecmp(standard.name, s->standard)) {
if (!av_strcasecmp(standard.name, s->standard)) {
break;
}
}
......
......@@ -19,11 +19,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <strings.h>
#include "libavutil/intreadwrite.h"
#include "libavutil/mathematics.h"
#include "libavutil/bswap.h"
#include "libavutil/dict.h"
#include "libavutil/avstring.h"
#include "avformat.h"
#include "avi.h"
#include "dv.h"
......@@ -281,7 +281,7 @@ static void avi_metadata_creation_time(AVDictionary **metadata, char *date)
if (sscanf(date, "%*3s%*[ ]%3s%*[ ]%2d%*[ ]%8s%*[ ]%4d",
month, &day, time, &year) == 4) {
for (i=0; i<12; i++)
if (!strcasecmp(month, months[i])) {
if (!av_strcasecmp(month, months[i])) {
snprintf(buffer, sizeof(buffer), "%.4d-%.2d-%.2d %s",
year, i+1, day, time);
av_dict_set(metadata, "creation_time", buffer, 0);
......
......@@ -22,7 +22,6 @@
#include "libavutil/avstring.h"
#include "avformat.h"
#include <unistd.h>
#include <strings.h>
#include "internal.h"
#include "network.h"
#include "http.h"
......@@ -251,12 +250,12 @@ static int process_line(URLContext *h, char *line, int line_count,
p++;
while (isspace(*p))
p++;
if (!strcasecmp(tag, "Location")) {
if (!av_strcasecmp(tag, "Location")) {
strcpy(s->location, p);
*new_location = 1;
} else if (!strcasecmp (tag, "Content-Length") && s->filesize == -1) {
} else if (!av_strcasecmp (tag, "Content-Length") && s->filesize == -1) {
s->filesize = atoll(p);
} else if (!strcasecmp (tag, "Content-Range")) {
} else if (!av_strcasecmp (tag, "Content-Range")) {
/* "bytes $from-$to/$document_size" */
const char *slash;
if (!strncmp (p, "bytes ", 6)) {
......@@ -266,16 +265,16 @@ static int process_line(URLContext *h, char *line, int line_count,
s->filesize = atoll(slash+1);
}
h->is_streamed = 0; /* we _can_ in fact seek */
} else if (!strcasecmp(tag, "Accept-Ranges") && !strncmp(p, "bytes", 5)) {
} else if (!av_strcasecmp(tag, "Accept-Ranges") && !strncmp(p, "bytes", 5)) {
h->is_streamed = 0;
} else if (!strcasecmp (tag, "Transfer-Encoding") && !strncasecmp(p, "chunked", 7)) {
} else if (!av_strcasecmp (tag, "Transfer-Encoding") && !av_strncasecmp(p, "chunked", 7)) {
s->filesize = -1;
s->chunksize = 0;
} else if (!strcasecmp (tag, "WWW-Authenticate")) {
} else if (!av_strcasecmp (tag, "WWW-Authenticate")) {
ff_http_auth_handle_header(&s->auth_state, tag, p);
} else if (!strcasecmp (tag, "Authentication-Info")) {
} else if (!av_strcasecmp (tag, "Authentication-Info")) {
ff_http_auth_handle_header(&s->auth_state, tag, p);
} else if (!strcasecmp (tag, "Connection")) {
} else if (!av_strcasecmp (tag, "Connection")) {
if (!strcmp(p, "close"))
s->willclose = 1;
}
......
......@@ -29,7 +29,6 @@
#include "avformat.h"
#include "avio_internal.h"
#include "internal.h"
#include <strings.h>
typedef struct {
const AVClass *class; /**< Class for private options. */
......@@ -121,7 +120,7 @@ static enum CodecID av_str2id(const IdStrMap *tags, const char *str)
str++;
while (tags->id) {
if (!strcasecmp(str, tags->str))
if (!av_strcasecmp(str, tags->str))
return tags->id;
tags++;
......
......@@ -33,9 +33,9 @@
#include "libavutil/random_seed.h"
#include "libavutil/lfg.h"
#include "libavutil/dict.h"
#include "libavutil/avstring.h"
#include "libavcodec/xiph.h"
#include "libavcodec/mpeg4audio.h"
#include <strings.h>
typedef struct ebml_master {
int64_t pos; ///< absolute offset in the file where the master's elements start
......@@ -760,7 +760,7 @@ static int mkv_write_tag(AVFormatContext *s, AVDictionary *m, unsigned int eleme
end_ebml_master(s->pb, targets);
while ((t = av_dict_get(m, "", t, AV_DICT_IGNORE_SUFFIX)))
if (strcasecmp(t->key, "title"))
if (av_strcasecmp(t->key, "title"))
mkv_write_simpletag(s->pb, t);
end_ebml_master(s->pb, tag);
......
......@@ -18,10 +18,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <strings.h>
#include "avformat.h"
#include "metadata.h"
#include "libavutil/dict.h"
#include "libavutil/avstring.h"
#if FF_API_OLD_METADATA2
AVDictionaryEntry *
......@@ -69,13 +69,13 @@ void ff_metadata_conv(AVDictionary **pm, const AVMetadataConv *d_conv,
key = mtag->key;
if (s_conv)
for (sc=s_conv; sc->native; sc++)
if (!strcasecmp(key, sc->native)) {
if (!av_strcasecmp(key, sc->native)) {
key = sc->generic;
break;
}
if (d_conv)
for (dc=d_conv; dc->native; dc++)
if (!strcasecmp(key, dc->generic)) {
if (!av_strcasecmp(key, dc->generic)) {
key = dc->native;
break;
}
......
......@@ -19,7 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <strings.h>
#include "avformat.h"
#include "avio_internal.h"
#include "id3v1.h"
......@@ -64,7 +63,7 @@ static int id3v1_create_tag(AVFormatContext *s, uint8_t *buf)
buf[127] = 0xFF; /* default to unknown genre */
if ((tag = av_dict_get(s->metadata, "TCON", NULL, 0))) { //genre
for(i = 0; i <= ID3v1_GENRE_MAX; i++) {
if (!strcasecmp(tag->value, ff_id3v1_genre_str[i])) {
if (!av_strcasecmp(tag->value, ff_id3v1_genre_str[i])) {
buf[127] = i;
count++;
break;
......
......@@ -20,7 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <strings.h>
#include "libavutil/avstring.h"
#include "libavutil/bswap.h"
#include "libavutil/dict.h"
......@@ -459,8 +458,8 @@ static int decode_info_header(NUTContext *nut){
set_disposition_bits(s, str_value, stream_id_plus1 - 1);
continue;
}
if(metadata && strcasecmp(name,"Uses")
&& strcasecmp(name,"Depends") && strcasecmp(name,"Replaces"))
if(metadata && av_strcasecmp(name,"Uses")
&& av_strcasecmp(name,"Depends") && av_strcasecmp(name,"Replaces"))
av_dict_set(metadata, name, str_value, 0);
}
}
......
......@@ -20,13 +20,13 @@
*/
#include "libavutil/mathematics.h"
#include "libavutil/avstring.h"
#include "libavcodec/get_bits.h"
#include "avformat.h"
#include "mpegts.h"
#include "url.h"
#include <unistd.h>
#include <strings.h>
#include "network.h"
#include "rtpdec.h"
......@@ -91,7 +91,7 @@ RTPDynamicProtocolHandler *ff_rtp_handler_find_by_name(const char *name,
RTPDynamicProtocolHandler *handler;
for (handler = RTPFirstDynamicPayloadHandler;
handler; handler = handler->next)
if (!strcasecmp(name, handler->enc_name) &&
if (!av_strcasecmp(name, handler->enc_name) &&
codec_type == handler->codec_type)
return handler;
return NULL;
......
......@@ -31,7 +31,6 @@
#include "internal.h"
#include "libavutil/avstring.h"
#include "libavcodec/get_bits.h"
#include <strings.h>
/** Structure listing useful vars to parse RTP packet payload*/
struct PayloadContext
......@@ -206,7 +205,7 @@ static int parse_fmtp(AVStream *stream, PayloadContext *data,
if (codec->codec_id == CODEC_ID_AAC) {
/* Looking for a known attribute */
for (i = 0; attr_names[i].str; ++i) {
if (!strcasecmp(attr, attr_names[i].str)) {
if (!av_strcasecmp(attr, attr_names[i].str)) {
if (attr_names[i].type == ATTR_NAME_TYPE_INT) {
*(int *)((char *)data+
attr_names[i].offset) = atoi(value);
......
......@@ -34,7 +34,6 @@
#if HAVE_POLL_H
#include <poll.h>
#endif
#include <strings.h>
#include "internal.h"
#include "network.h"
#include "os_support.h"
......@@ -661,7 +660,7 @@ static void rtsp_parse_transport(RTSPMessageHeader *reply, const char *p)
get_word_sep(transport_protocol, sizeof(transport_protocol),
"/", &p);
if (!strcasecmp (transport_protocol, "rtp")) {
if (!av_strcasecmp (transport_protocol, "rtp")) {
get_word_sep(profile, sizeof(profile), "/;,", &p);
lower_transport[0] = '\0';
/* rtp/avp/<protocol> */
......@@ -670,14 +669,14 @@ static void rtsp_parse_transport(RTSPMessageHeader *reply, const char *p)
";,", &p);
}
th->transport = RTSP_TRANSPORT_RTP;
} else if (!strcasecmp (transport_protocol, "x-pn-tng") ||
!strcasecmp (transport_protocol, "x-real-rdt")) {
} else if (!av_strcasecmp (transport_protocol, "x-pn-tng") ||
!av_strcasecmp (transport_protocol, "x-real-rdt")) {
/* x-pn-tng/<protocol> */
get_word_sep(lower_transport, sizeof(lower_transport), "/;,", &p);
profile[0] = '\0';
th->transport = RTSP_TRANSPORT_RDT;
}
if (!strcasecmp(lower_transport, "TCP"))
if (!av_strcasecmp(lower_transport, "TCP"))
th->lower_transport = RTSP_LOWER_TRANSPORT_TCP;
else
th->lower_transport = RTSP_LOWER_TRANSPORT_UDP;
......@@ -1556,7 +1555,7 @@ redirect:
if (rt->server_type != RTSP_SERVER_REAL && reply->real_challenge[0]) {
rt->server_type = RTSP_SERVER_REAL;
continue;
} else if (!strncasecmp(reply->server, "WMServer/", 9)) {
} else if (!av_strncasecmp(reply->server, "WMServer/", 9)) {
rt->server_type = RTSP_SERVER_WMS;
} else if (rt->server_type == RTSP_SERVER_REAL)
strcpy(real_challenge, reply->real_challenge);
......
......@@ -37,7 +37,6 @@
#include "url.h"
#include <sys/time.h>
#include <time.h>
#include <strings.h>
#include <stdarg.h>
#if CONFIG_NETWORK
#include "network.h"
......@@ -169,7 +168,7 @@ int av_match_ext(const char *filename, const char *extensions)
while (*p != '\0' && *p != ',' && q-ext1<sizeof(ext1)-1)
*q++ = *p++;
*q = '\0';
if (!strcasecmp(ext1, ext))
if (!av_strcasecmp(ext1, ext))
return 1;
if (*p == '\0')
break;
......@@ -190,11 +189,11 @@ static int match_format(const char *name, const char *names)
namelen = strlen(name);
while ((p = strchr(names, ','))) {
len = FFMAX(p - names, namelen);
if (!strncasecmp(name, names, len))
if (!av_strncasecmp(name, names, len))
return 1;
names = p+1;
}
return !strcasecmp(name, names);
return !av_strcasecmp(name, names);
}
AVOutputFormat *av_guess_format(const char *short_name, const char *filename,
......
......@@ -21,7 +21,6 @@
* misc parsing utilities
*/
#include <strings.h>
#include <sys/time.h>
#include <time.h>
......@@ -294,7 +293,7 @@ static ColorEntry color_table[] = {
static int color_table_compare(const void *lhs, const void *rhs)
{
return strcasecmp(lhs, ((const ColorEntry *)rhs)->name);
return av_strcasecmp(lhs, ((const ColorEntry *)rhs)->name);
}
#define ALPHA_SEP '@'
......@@ -320,7 +319,7 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen,
len = strlen(color_string2);
rgba_color[3] = 255;
if (!strcasecmp(color_string2, "random") || !strcasecmp(color_string2, "bikeshed")) {
if (!av_strcasecmp(color_string2, "random") || !av_strcasecmp(color_string2, "bikeshed")) {
int rgba = av_get_random_seed();
rgba_color[0] = rgba >> 24;
rgba_color[1] = rgba >> 16;
......@@ -515,7 +514,7 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration)
p = timestr;
q = NULL;
if (!duration) {
if (!strncasecmp(timestr, "now", len)) {
if (!av_strncasecmp(timestr, "now", len)) {
*timeval = (int64_t) now * 1000000;
return 0;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment