summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Font.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Font.cc b/src/Font.cc
index 5f70f29..22fd192 100644
--- a/src/Font.cc
+++ b/src/Font.cc
@@ -19,11 +19,10 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22//$Id: Font.cc,v 1.7 2002/08/04 15:36:19 fluxgen Exp $ 22//$Id: Font.cc,v 1.8 2002/08/20 02:22:29 fluxgen Exp $
23 23
24 24
25#include "Font.hh" 25#include "Font.hh"
26#include "StringUtil.hh"
27 26
28#ifdef HAVE_CONFIG_H 27#ifdef HAVE_CONFIG_H
29#include "../config.h" 28#include "../config.h"
@@ -215,7 +214,7 @@ const char *Font::getFontElement(const char *pattern, char *buf, int bufsiz, ...
215 buf[bufsiz-1] = 0; 214 buf[bufsiz-1] = 0;
216 buf[bufsiz-2] = '*'; 215 buf[bufsiz-2] = '*';
217 while((v = va_arg(va, char *)) != 0) { 216 while((v = va_arg(va, char *)) != 0) {
218 p = StringUtil::strcasestr(pattern, v); 217 p = strcasestr(pattern, v);
219 if (p) { 218 if (p) {
220 std::strncpy(buf, p+1, bufsiz-2); 219 std::strncpy(buf, p+1, bufsiz-2);
221 p2 = strchr(buf, '-'); 220 p2 = strchr(buf, '-');