minor cosmetic changes as per Phil Bull.

[evince.git] / backend / dvi / mdvi-lib / fontmap.c

diff --git a/backend/dvi/mdvi-lib/fontmap.c b/backend/dvi/mdvi-lib/fontmap.c
index 88ba89fd15ddff77d836479b0011dec0266f1097..c3c3a8d3e65530559b03cc9a6aa49fef68585b34 100644 (file)
--- a/backend/dvi/mdvi-lib/fontmap.c
+++ b/backend/dvi/mdvi-lib/fontmap.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <config.h>
@@ -119,7 +119,7 @@ static int read_encoding(DviEncoding *enc)
        
        ASSERT(enc->private == NULL);
 
-       in = fopen(enc->filename, "r");
+       in = fopen(enc->filename, "rb");
        if(in == NULL) {
                DEBUG((DBG_FMAP, "%s: could not read `%s' (%s)\n",
                        enc->name, enc->filename, strerror(errno)));
@@ -267,7 +267,7 @@ static DviEncoding *register_encoding(const char *basefile, int replace)
        if(filename == NULL)
                filename = mdvi_strdup(basefile);
 
-       in = fopen(filename, "r");
+       in = fopen(filename, "rb");
        if(in == NULL) {
                mdvi_free(filename);
                return NULL;
@@ -478,9 +478,9 @@ DviFontMapEnt       *mdvi_load_fontmap(const char *file)
        if(ptr == NULL)
                ptr = kpse_find_file(file, kpse_dvips_config_format, 0);
        if(ptr == NULL)
-               in = fopen(file, "r");                  
+               in = fopen(file, "rb");
        else {
-               in = fopen(ptr, "r");
+               in = fopen(ptr, "rb");
                mdvi_free(ptr);
        }
        if(in == NULL)
@@ -586,7 +586,7 @@ DviFontMapEnt       *mdvi_load_fontmap(const char *file)
                }
                if(ent->encfile && enc){                
                        if(ent->encoding && !STREQ(ent->encoding, enc->name)) {
-                               warning(
+                               mdvi_warning(
        _("%s: %d: [%s] requested encoding `%s' does not match vector `%s'\n"),
                                        file, lineno, ent->encfile,
                                        ent->encoding, enc->name);
@@ -728,9 +728,9 @@ static int  mdvi_init_fontmaps(void)
        /* let's ask kpathsea for the file first */
        file = kpse_find_file(config, kpse_program_text_format, 0);
        if(file == NULL)
-               in = fopen(config, "r");
+               in = fopen(config, "rb");
        else {
-               in = fopen(file, "r");
+               in = fopen(file, "rb");
                mdvi_free(file);
        }
        if(in == NULL)
@@ -749,7 +749,7 @@ static int  mdvi_init_fontmaps(void)
                        DEBUG((DBG_FMAP, "%s: loading fontmap\n", arg));
                        ent = mdvi_load_fontmap(arg);
                        if(ent == NULL)
-                               warning(_("%s: could not load fontmap\n"), arg);
+                               mdvi_warning(_("%s: could not load fontmap\n"), arg);
                        else {
                                DEBUG((DBG_FMAP, 
                                        "%s: installing fontmap\n", arg));
@@ -763,8 +763,8 @@ static int  mdvi_init_fontmaps(void)
                } else if(STRNEQ(line, "default-encoding", 16)) {
                        arg = getstring(line + 16, " \t", &line); *line = 0;
                        if(mdvi_set_default_encoding(arg) < 0)
-                               warning(_("%s: could not set as default encoding\n"),
-                                       arg);
+                               mdvi_warning(_("%s: could not set as default encoding\n"),
+                                            arg);
                } else if(STRNEQ(line, "psfontpath", 10)) {
                        arg = getstring(line + 11, " \t", &line); *line = 0;
                        if(!psinitialized)
@@ -782,8 +782,8 @@ static int  mdvi_init_fontmaps(void)
                } else if(STRNEQ(line, "psfontmap", 9)) {
                        arg = getstring(line + 9, " \t", &line); *line = 0;
                        if(mdvi_ps_read_fontmap(arg) < 0)
-                               warning("%s: %s: could not read PS fontmap\n",
-                                       config, arg);
+                               mdvi_warning("%s: %s: could not read PS fontmap\n",
+                                            config, arg);
                }
        }
        fclose(in);
@@ -842,8 +842,8 @@ void        mdvi_flush_encodings(void)
        for(; (enc = (DviEncoding *)encodings.head); ) {
                encodings.head = LIST(enc->next);
                if((enc != tex_text_encoding && enc->links) || enc->links > 1) {
-                       warning(_("encoding vector `%s' is in use\n"),
-                               enc->name);
+                       mdvi_warning(_("encoding vector `%s' is in use\n"),
+                                    enc->name);
                }
                destroy_encoding(enc);
        }
@@ -906,7 +906,7 @@ int mdvi_ps_read_fontmap(const char *name)
                fullname = kpse_path_search(pslibdir, name, 1);
        else
                fullname = (char *)name;
-       in = fopen(fullname, "r");
+       in = fopen(fullname, "rb");
        if(in == NULL) {
                if(fullname != name)
                        mdvi_free(fullname);