X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cde%2Fprograms%2Fdtlogin%2Fresource.c;h=6608dba540c99776a690642cb982bc21c5fcc90a;hb=ee4a0a37ea2352311e30f1c63df1d1b471c30e8d;hp=4314a6b4faa2c41a83a4a3d4f5463b49fafcc99f;hpb=1fe5a550b25493541cf9dfb21bbf2f8eaf7ebcd4;p=oweals%2Fcde.git

diff --git a/cde/programs/dtlogin/resource.c b/cde/programs/dtlogin/resource.c
index 4314a6b4..6608dba5 100644
--- a/cde/programs/dtlogin/resource.c
+++ b/cde/programs/dtlogin/resource.c
@@ -90,9 +90,6 @@ int 	langListTimeout;
 #ifdef DEF_NETWORK_DEV
 char    *networkDev;
 #endif
-#if defined(__osf__)
-char	*ignoreLocales;
-#endif
 
 /*
  * Dtlogin will accept both Dtlogin and XDM resources. The string variable
@@ -222,12 +219,6 @@ static	char	AppName[16] = DTLOGIN;
 #  ifdef __apollo
 #    define DEF_LANG	"C"
 #  endif
-#  ifdef __osf__
-#    define DEF_LANG    "C"
-#  endif
-#  ifdef __hp_osf
-#    define DEF_LANG	"en_US.88591"
-#  endif
 #  ifdef sun	/* default language under Solaris */
 #    define DEF_LANG    "C" 
 #  endif
@@ -290,10 +281,6 @@ struct dmResources {
 "networkDevice","NetworkDevice",DM_STRING,      &networkDev,
                                 DEF_NETWORK_DEV,
 #endif
-#if defined(__osf__)
-"ignoreLocales", "IgnoreLocales", DM_STRING,    &ignoreLocales,
-				"",
-#endif
 };
 
 # define NUM_DM_RESOURCES	(sizeof DmResources / sizeof DmResources[0])
@@ -409,6 +396,7 @@ GetResource( char *name, char *class, int valueType, char **valuep,
     char	*type;
     XrmValue	value;
     char	*string, *new_string;
+    char	empty[] = "";
     char	str_buf[50];
     int	len;
 
@@ -422,8 +410,13 @@ GetResource( char *name, char *class, int valueType, char **valuep,
     }
     else
     {
-	string = default_value;
-	len = (string == NULL ? 0 : strlen (string));
+	if(default_value) {
+		string = default_value;
+		len = strlen (string);
+	} else {
+		string = empty;
+		len = 0;
+	}
     }
 
     Debug ("%s/%s value %*.*s\n", name, class, len, len, string);