From 58c9d21f589ba78f9baa5ead6bc17ff0f89a597c Mon Sep 17 00:00:00 2001
From: Ben Harris <bjh21@bjh21.me.uk>
Date: Sat, 25 Jan 2003 19:21:56 +0000
Subject: [PATCH] Don't pass NULL to strcmp.  Instead, if the user passes a
 font of NULL, only match table entries where the font is NULL.

[originally from svn r2725]
---
 charset/macenc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charset/macenc.c b/charset/macenc.c
index 43105633..4aa02d1b 100644
--- a/charset/macenc.c
+++ b/charset/macenc.c
@@ -1,4 +1,4 @@
-/* $Id: macenc.c,v 1.1 2003/01/01 19:51:12 ben Exp $ */
+/* $Id: macenc.c,v 1.2 2003/01/25 19:21:56 ben Exp $ */
 /*
  * Copyright (c) 2003 Ben Harris
  * All rights reserved.
@@ -162,7 +162,7 @@ int charset_from_macenc(int script, int region, int sysvers,
 	    (macencs[i].region < 0 || macencs[i].region == region) &&
 	    (macencs[i].sysvermin <= sysvers) &&
 	    (macencs[i].fontname == NULL ||
-	     strcmp(macencs[i].fontname, fontname) == 0))
+	     (fontname != NULL && strcmp(macencs[i].fontname, fontname) == 0)))
 	    return macencs[i].charset;
 
     return CS_NONE;