commit cd25d262d932e9882598b61236b81692ddbaa5af
author Zesstra <zesstra@zesstra.de> Tue Jan 21 19:36:39 2020 +0100
committer Zesstra <zesstra@zesstra.de> Tue Jan 21 19:36:39 2020 +0100
tree 7a85f456c98bfd396c9fe8a59e881e82e76085ab
parent e89001526038d51bf1c6e843e38fccd1899726a3

Replace get_userinfo() by query_userlist().

Change-Id: I5e4d9f9c0a7d7711013df40e6d50307fcb12ff7e

secure/simul_efun/livings.c

diff --git a/secure/simul_efun/livings.c b/secure/simul_efun/livings.c
index 4ed04b4..2d0ffde 100644
--- a/secure/simul_efun/livings.c
+++ b/secure/simul_efun/livings.c
@@ -1,5 +1,7 @@
 // * living_name-Behandlung
 
+#include "/sys/userinfo.h"
+
 #define clean_log(s)
 //#define clean_log(s) log_file("CLEAN_SIM",ctime(time())[4..18]+": "+(s));
 
@@ -23,21 +25,19 @@
 
 public varargs string getuuid( object ob )
 {
-    mixed *ret;
+  if ( !objectp(ob) )
+     ob = previous_object();
 
-    if ( !objectp(ob) )
-       ob = previous_object();
+  if ( !query_once_interactive(ob) )
+     return getuid(ob);
 
-    if ( !query_once_interactive(ob) )
-       return getuid(ob);
+  int creation = master()->query_userlist(getuid(ob), USER_CREATION_DATE);
 
-    ret = master()->get_userinfo( getuid(ob) );
+  if (!intp(creation))
+     return getuid(ob);
 
-    if ( !pointerp(ret) || sizeof(ret) < 5 )
-       return getuid(ob);
-
-    // Username + "_" + CreationDate
-    return ret[0] + "_" + ret[5];
+  // Username + "_" + CreationDate
+  return getuid(ob) + "_" + creation;
 }
 
 void set_object_living_name(string livname, object obj)

secure/simul_efun/spare/livings.c

diff --git a/secure/simul_efun/spare/livings.c b/secure/simul_efun/spare/livings.c
index 4ed04b4..2d0ffde 100644
--- a/secure/simul_efun/spare/livings.c
+++ b/secure/simul_efun/spare/livings.c
@@ -1,5 +1,7 @@
 // * living_name-Behandlung
 
+#include "/sys/userinfo.h"
+
 #define clean_log(s)
 //#define clean_log(s) log_file("CLEAN_SIM",ctime(time())[4..18]+": "+(s));
 
@@ -23,21 +25,19 @@
 
 public varargs string getuuid( object ob )
 {
-    mixed *ret;
+  if ( !objectp(ob) )
+     ob = previous_object();
 
-    if ( !objectp(ob) )
-       ob = previous_object();
+  if ( !query_once_interactive(ob) )
+     return getuid(ob);
 
-    if ( !query_once_interactive(ob) )
-       return getuid(ob);
+  int creation = master()->query_userlist(getuid(ob), USER_CREATION_DATE);
 
-    ret = master()->get_userinfo( getuid(ob) );
+  if (!intp(creation))
+     return getuid(ob);
 
-    if ( !pointerp(ret) || sizeof(ret) < 5 )
-       return getuid(ob);
-
-    // Username + "_" + CreationDate
-    return ret[0] + "_" + ret[5];
+  // Username + "_" + CreationDate
+  return getuid(ob) + "_" + creation;
 }
 
 void set_object_living_name(string livname, object obj)