poke-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[COMMITTED 2/7] poked: move `poked_libpoke_version' def to `poked.pk'


From: Mohammad-Reza Nabipoor
Subject: [COMMITTED 2/7] poked: move `poked_libpoke_version' def to `poked.pk'
Date: Sun, 4 Dec 2022 23:04:57 +0100

2022-12-04  Mohammad-Reza Nabipoor  <mnabipoor@gnu.org>

        * poked/poked.pk (__poked_libpoke_version): New variable.
        (poked_libpoke_version): New function.
        * poked/poked.c (poked_init): Set `__poked_libpoke_version'.
---
 ChangeLog      | 6 ++++++
 poked/poked.c  | 5 +----
 poked/poked.pk | 4 +++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d47097b0..fa8507b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-12-04  Mohammad-Reza Nabipoor  <mnabipoor@gnu.org>
+
+       * poked/poked.pk (__poked_libpoke_version): New variable.
+       (poked_libpoke_version): New function.
+       * poked/poked.c (poked_init): Set `__poked_libpoke_version'.
+
 2022-12-04  Mohammad-Reza Nabipoor  <mnabipoor@gnu.org>
 
        * poked/poked.c (main): Print PDAP version.
diff --git a/poked/poked.c b/poked/poked.c
index 90989e86..c13df3bd 100644
--- a/poked/poked.c
+++ b/poked/poked.c
@@ -868,10 +868,7 @@ poked_init (int pdap_version)
 
   pk_decl_set_val (pkc, "__poked_pdap_version",
                    pk_make_int (pdap_version, 32));
-
-  if (pk_defvar (pkc, "poked_libpoke_version", pk_make_string (VERSION))
-      == PK_NULL)
-    errx (1, "unable to declare poked_libpoke_version variable");
+  pk_decl_set_val (pkc, "__poked_libpoke_version", pk_make_string (VERSION));
 
   return OK;
 }
diff --git a/poked/poked.pk b/poked/poked.pk
index 0d746615..1c3a136b 100644
--- a/poked/poked.pk
+++ b/poked/poked.pk
@@ -21,10 +21,12 @@ load "pk-dump-minimal.pk";
 // FIXME be endian-correct
 // FIXME offset<long,N> -> offset<ulong,N>
 
-// `poked.c' will initialize it to the right value.
+// `poked.c' will initialize these to the right value.
 var __poked_pdap_version = -1;
+var __poked_libpoke_version = "";
 
 fun poked_pdap_version = int<32>: { return __poked_pdap_version; }
+fun poked_libpoke_version = string: { return __poked_libpoke_version; }
 
 var __poked_restart_p = 0;
 var __poked_exit_p = 0;
-- 
2.38.1




reply via email to

[Prev in Thread] Current Thread [Next in Thread]