aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2010-05-18 10:08:33 +0200
committerJuanma Barranquero2010-05-18 10:08:33 +0200
commit161e44d1194b137b6e2765e8e8c8a1ddee7d02c2 (patch)
tree1b886920b3dde3f1509aff1f5ed89716408e0713
parent952d5580c9fa32e3ed05de389b8715ee20c20ea9 (diff)
downloademacs-161e44d1194b137b6e2765e8e8c8a1ddee7d02c2.tar.gz
emacs-161e44d1194b137b6e2765e8e8c8a1ddee7d02c2.zip
* charset.c (load_charset_map_from_file): Don't call close after fclose.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/charset.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f271c52907c..8841d8529e3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12010-05-18 Juanma Barranquero <lekktu@gmail.com>
2
3 * charset.c (load_charset_map_from_file): Don't call close after fclose.
4
12010-05-18 Glenn Morris <rgm@gnu.org> 52010-05-18 Glenn Morris <rgm@gnu.org>
2 6
3 * s/gnu-linux.h: Combine two conditionals. 7 * s/gnu-linux.h: Combine two conditionals.
diff --git a/src/charset.c b/src/charset.c
index 18c0bbb6310..f83fa994536 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -567,7 +567,6 @@ load_charset_map_from_file (charset, mapfile, control_flag)
567 n_entries++; 567 n_entries++;
568 } 568 }
569 fclose (fp); 569 fclose (fp);
570 close (fd);
571 570
572 load_charset_map (charset, head, n_entries, control_flag); 571 load_charset_map (charset, head, n_entries, control_flag);
573 SAFE_FREE (); 572 SAFE_FREE ();