summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-06-01 22:16:41 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-06-01 22:16:41 +0000
commitcc1edea30e95db96a6677c518b5d1494287bd92a (patch)
tree2748d1e7893940ab1ddbf617a099157de74d96e5
parent1e7437181a7f9bb1c214461370832e1d95e6a443 (diff)
downloadmpv-cc1edea30e95db96a6677c518b5d1494287bd92a.tar.bz2
mpv-cc1edea30e95db96a6677c518b5d1494287bd92a.tar.xz
warning fixes by Dominik
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10237 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--m_option.c3
-rw-r--r--subreader.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/m_option.c b/m_option.c
index ba4facbee4..467adb7d33 100644
--- a/m_option.c
+++ b/m_option.c
@@ -1493,7 +1493,8 @@ static void copy_obj_settings_list(m_option_t* opt,void* dst, void* src) {
d[n].attribs = NULL;
copy_str_list(NULL,&(d[n].attribs),&(s[n].attribs));
}
- d[n].name = d[n].attribs = NULL;
+ d[n].name = NULL;
+ d[n].attribs = NULL;
VAL(dst) = d;
}
diff --git a/subreader.c b/subreader.c
index 5d364085fc..b9c7ef0bb0 100644
--- a/subreader.c
+++ b/subreader.c
@@ -1648,7 +1648,7 @@ char** sub_filenames(char* path, char *fname)
for (j = 0; j <= 1; j++) {
d = opendir(j == 0 ? f_dir : path);
if (d) {
- while (de = readdir(d)) {
+ while ((de = readdir(d))) {
// retrieve various parts of the filename
strcpy_strip_ext(tmp_fname_noext, de->d_name);
strcpy_get_ext(tmp_fname_ext, de->d_name);