summaryrefslogtreecommitdiffstats
path: root/osdep
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-01-13 16:13:13 +0100
committerwm4 <wm4@nowhere>2013-01-13 17:32:39 +0100
commit20c9dfa61692d9ed741a91177d3fa185d73c02dd (patch)
tree8931b8f4036bbcc4941c8d372546b08dbd75e53b /osdep
parentcbdee50f29e2d1c44453f7b5ed5d67296f7a16dc (diff)
downloadmpv-20c9dfa61692d9ed741a91177d3fa185d73c02dd.tar.bz2
mpv-20c9dfa61692d9ed741a91177d3fa185d73c02dd.tar.xz
Replace strsep() uses
This function sucks and apparently is not very portable (at least on mingw, the configure check fails). Also remove the emulation of that function from osdep/strsep*, and remove the configure check.
Diffstat (limited to 'osdep')
-rw-r--r--osdep/strsep.c58
-rw-r--r--osdep/strsep.h30
2 files changed, 0 insertions, 88 deletions
diff --git a/osdep/strsep.c b/osdep/strsep.c
deleted file mode 100644
index 3f911ac0e7..0000000000
--- a/osdep/strsep.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * strsep implementation for systems that do not have it in libc
- *
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <string.h>
-
-#include "config.h"
-#include "strsep.h"
-
-char *strsep(char **stringp, const char *delim) {
- char *begin, *end;
-
- begin = *stringp;
- if(begin == NULL)
- return NULL;
-
- if(delim[0] == '\0' || delim[1] == '\0') {
- char ch = delim[0];
-
- if(ch == '\0')
- end = NULL;
- else {
- if(*begin == ch)
- end = begin;
- else if(*begin == '\0')
- end = NULL;
- else
- end = strchr(begin + 1, ch);
- }
- }
- else
- end = strpbrk(begin, delim);
-
- if(end) {
- *end++ = '\0';
- *stringp = end;
- }
- else
- *stringp = NULL;
-
- return begin;
-}
diff --git a/osdep/strsep.h b/osdep/strsep.h
deleted file mode 100644
index fbd377f084..0000000000
--- a/osdep/strsep.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * strsep implementation for systems that do not have it in libc
- *
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef MPLAYER_STRSEP_H
-#define MPLAYER_STRSEP_H
-
-#include <string.h>
-#include "config.h"
-
-#ifndef HAVE_STRSEP
-char *strsep(char **stringp, const char *delim);
-#endif
-
-#endif /* MPLAYER_STRSEP_H */