diff --git a/src/font/scripteasy.c b/src/font/scripteasy.c
index a2ef1ebb..442c766d 100644
--- a/src/font/scripteasy.c
+++ b/src/font/scripteasy.c
@@ -103,7 +103,7 @@ static void unlock(void)
 static BOOL load_fonts(void)
 {
     int i;
-    int font_table_size = se_font_desc.font_name_map_size;    
+    int font_table_size = se_font_desc.font_name_map_size;
     BOOL result = FALSE;
 
 #if SE_MINIGUI_TRACE
diff --git a/src/font/upf.c b/src/font/upf.c
index ca9b1b2f..299cf1db 100644
--- a/src/font/upf.c
+++ b/src/font/upf.c
@@ -115,13 +115,6 @@ static void* load_font_data (DEVFONT* devfont, const char* font_name, const char
         goto error;
     }
 
-#if 0
-    if (real_font_name) {
-        strncpy (real_font_name, filehead->font_name, LEN_DEVFONT_NAME_MAX);
-        real_font_name [LEN_DEVFONT_NAME_MAX] = '\0';
-    }
-#endif
-
     fclose (fp);
     return upf_info;
 
diff --git a/src/font/upf.h b/src/font/upf.h
index f5fb9c1e..5b29f785 100644
--- a/src/font/upf.h
+++ b/src/font/upf.h
@@ -40,9 +40,9 @@
 #ifndef GUI_FONT_UPF_H
     #define GUI_FONT_UPF_H
 
-#define LEN_VERSION_MAX       10
-#define LEN_VENDER_NAME_MAX   12
-#define LEN_DEVFONT_NAME_MAX  127
+#define LEN_VERSION_MAX         10
+#define LEN_VENDER_NAME_MAX     12
+#define LEN_UPF_NAME_MAX        127
 
 #ifdef __cplusplus
 extern "C" {
@@ -100,7 +100,7 @@ typedef struct
     char     vender_name [LEN_VENDER_NAME_MAX];
     Uint16   endian;
 
-    char     font_name [LEN_DEVFONT_NAME_MAX + 1];
+    char     font_name [LEN_UPF_NAME_MAX + 1];
 
     Uint8    width;
     Uint8    height;