summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2001-06-15 10:17:53 +0000
committerDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2001-06-15 10:17:53 +0000
commitd32ef2344b203ca58b2b5f1869f551ba0f1280fa (patch)
tree32e69edb9f2252f932410eab1e5e343bbde5b534
parentcb7fbe425753f04a0e3ac33325274f288373816a (diff)
downloadxine-lib-d32ef2344b203ca58b2b5f1869f551ba0f1280fa.tar.gz
xine-lib-d32ef2344b203ca58b2b5f1869f551ba0f1280fa.tar.bz2
Passing NULL to config_file_lookup_str() is valid.
CVS patchset: 186 CVS date: 2001/06/15 10:17:53
-rw-r--r--src/xine-engine/configfile.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c
index 1903db791..2372dbe2c 100644
--- a/src/xine-engine/configfile.c
+++ b/src/xine-engine/configfile.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: configfile.c,v 1.1 2001/04/18 22:36:01 f1rmb Exp $
+ * $Id: configfile.c,v 1.2 2001/06/15 10:17:53 f1rmb Exp $
*
* config file management - implementation
*
@@ -103,7 +103,8 @@ static char *config_file_lookup_str (config_values_t *this,
if (entry)
return entry->value;
- config_file_add (this, key, str_default);
+ if(str_default)
+ config_file_add (this, key, str_default);
return str_default;
}
@@ -277,8 +278,11 @@ config_values_t *config_file_init (char *filename) {
/*
* $Log: configfile.c,v $
- * Revision 1.1 2001/04/18 22:36:01 f1rmb
- * Initial revision
+ * Revision 1.2 2001/06/15 10:17:53 f1rmb
+ * Passing NULL to config_file_lookup_str() is valid.
+ *
+ * Revision 1.1.1.1 2001/04/18 22:36:01 f1rmb
+ * Initial import into CVS
*
* Revision 1.8 2001/03/31 03:42:25 guenter
* more cleanups, started xv driver