STR_UI_XNSTRING -> STR_DATA.

diff --git a/lib/silccore/silcnotify.c b/lib/silccore/silcnotify.c
index 4f6feacbda0a14c42aaff2f1d3c0dc8196b7fd1e..645f3a536f42543c2f49b09dda6aea569ae92c2f 100644 (file)
--- a/lib/silccore/silcnotify.c
+++ b/lib/silccore/silcnotify.c
@@ -63,7 +63,8 @@ SilcNotifyPayload silc_notify_payload_parse(const unsigned char *payload,
 
   if (newp->argc) {
     silc_buffer_pull(&buffer, 5);
-    newp->args = silc_argument_payload_parse(buffer.data, silc_buffer_len(&buffer),
+    newp->args = silc_argument_payload_parse(buffer.data,
+                                            silc_buffer_len(&buffer),
                                             newp->argc);
     silc_buffer_push(&buffer, 5);
   }
@@ -142,11 +143,10 @@ SilcBuffer silc_notify_payload_encode(SilcNotifyType type, SilcUInt32 argc,
                     SILC_STR_END);
 
   if (k) {
-    silc_buffer_pull(buffer, 5);
     silc_buffer_format(buffer,
-                      SILC_STR_UI_XNSTRING(args->data, silc_buffer_len(args)),
+                      SILC_STR_OFFSET(5),
+                      SILC_STR_DATA(args->data, silc_buffer_len(args)),
                       SILC_STR_END);
-    silc_buffer_push(buffer, 5);
     silc_buffer_free(args);
   }
 
@@ -172,13 +172,11 @@ SilcBuffer silc_notify_payload_encode_args(SilcNotifyType type,
                     SILC_STR_UI_CHAR(argc),
                     SILC_STR_END);
 
-  if (args) {
-    silc_buffer_pull(buffer, 5);
+  if (args)
     silc_buffer_format(buffer,
-                      SILC_STR_UI_XNSTRING(args->data, silc_buffer_len(args)),
+                      SILC_STR_OFFSET(5),
+                      SILC_STR_DATA(args->data, silc_buffer_len(args)),
                       SILC_STR_END);
-    silc_buffer_push(buffer, 5);
-  }
 
   return buffer;
 }

diff --git a/lib/silccore/silcpubkey.c b/lib/silccore/silcpubkey.c
index 9583f397ab9384cb4a416411cbbda213e5a6dedb..f0e20e2e558dff358caeb83cf7b4c1052b95e149 100644 (file)
--- a/lib/silccore/silcpubkey.c
+++ b/lib/silccore/silcpubkey.c
@@ -45,7 +45,7 @@ SilcBuffer silc_public_key_payload_encode(SilcPublicKey public_key)
   if (silc_buffer_format(buffer,
                         SILC_STR_UI_SHORT(pk_len),
                         SILC_STR_UI_SHORT(type),
-                        SILC_STR_UI_XNSTRING(pk, pk_len),
+                        SILC_STR_DATA(pk, pk_len),
                         SILC_STR_END) < 0) {
     silc_buffer_free(buffer);
     silc_free(pk);
@@ -72,6 +72,7 @@ SilcBool silc_public_key_payload_decode(unsigned char *data,
 
   silc_buffer_set(&buf, data, data_len);
   ret = silc_buffer_unformat(&buf,
+                            SILC_STR_ADVANCE,
                             SILC_STR_UI_SHORT(&pk_len),
                             SILC_STR_UI_SHORT(&pk_type),
                             SILC_STR_END);
@@ -81,9 +82,8 @@ SilcBool silc_public_key_payload_decode(unsigned char *data,
   if (pk_type < SILC_PKCS_SILC || pk_type > SILC_PKCS_SPKI)
     return FALSE;
 
-  silc_buffer_pull(&buf, 4);
   ret = silc_buffer_unformat(&buf,
-                            SILC_STR_UI_XNSTRING(&pk, pk_len),
+                            SILC_STR_DATA(&pk, pk_len),
                             SILC_STR_END);
   if (ret < 0)
     return FALSE;