summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-08-22 01:52:22 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:34:18 -0500
commitf4aa80d88f768d4edbfca2bf0907de0e1c319ec5 (patch)
treee939c4391f3e197eee0e514820f28b5d56dc21b3
parent81556a90785c90f928690929c5735bc3ee9c8eca (diff)
downloadsamba-f4aa80d88f768d4edbfca2bf0907de0e1c319ec5.tar.gz
samba-f4aa80d88f768d4edbfca2bf0907de0e1c319ec5.tar.bz2
samba-f4aa80d88f768d4edbfca2bf0907de0e1c319ec5.zip
r9465: handle encoding and decoding of pointers, representing them as a
string containing "(POINTER)" (This used to be commit 6f69eeb8f258063f1ac911ab38e667e7743ccba3)
-rw-r--r--source4/scripting/libjs/encoder.js2
-rw-r--r--swat/scripting/client/encoder.js2
2 files changed, 3 insertions, 1 deletions
diff --git a/source4/scripting/libjs/encoder.js b/source4/scripting/libjs/encoder.js
index 24508f3f6b..d96b859547 100644
--- a/source4/scripting/libjs/encoder.js
+++ b/source4/scripting/libjs/encoder.js
@@ -52,6 +52,8 @@ function encodeElement(e, name) {
r = s.sprintf("%s:%s:%s:", name, t, "" + e);
} else if (t == "undefined" || t == "null") {
r = s.sprintf("%s:%s:", name, t);
+ } else if (t == "pointer") {
+ r = s.sprintf("%s:string:(POINTER):", name);
} else {
println("Unable to linearise type " + t);
r = "";
diff --git a/swat/scripting/client/encoder.js b/swat/scripting/client/encoder.js
index 2b1db669d2..4aa4cc0954 100644
--- a/swat/scripting/client/encoder.js
+++ b/swat/scripting/client/encoder.js
@@ -71,7 +71,7 @@ function decodeObjectArray(a) {
value = a[a.i]; a.i++;
o[name] = value * 1;
} else {
- alert("Unable to delinearise type " + t);
+ alert("Unable to delinearise type " + type);
}
}
return o;