From: Zachary T Welch <zw@superlucidity.net>
Date: Sun, 15 Nov 2009 12:18:51 +0000 (-0800)
Subject: add more command_handler conversion macros
X-Git-Tag: v0.4.0-rc1~531
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5b9899d6ea1e0cf763465c64c700f20eddd893f9;p=openocd

add more command_handler conversion macros

Add additional macros to allow command handling to be migrated easily:
CMD_CTX, CMD_ARGC, and CMD_ARGV.  Updates CMD_NAME to use CMD_ARGV.

In addition to making the remaining patches of this series cleaner,
this introduces easily sed-able symbols that could allow us to retire
these once the command handler infrastructure matures (i.e. pre-1.0).
---

diff --git a/src/helper/command.h b/src/helper/command.h
index 79e57f5a..3e366275 100644
--- a/src/helper/command.h
+++ b/src/helper/command.h
@@ -121,11 +121,26 @@ struct command_context
  */
 #define COMMAND_HELPER(name, extra...) __COMMAND_HANDLER(name, extra)
 
+/**
+ * Use this macro to access the context of the command being handled,
+ * rather than accessing the variable directly.  It may be moved.
+ */
+#define CMD_CTX cmd_ctx
+/**
+ * Use this macro to access the number of arguments for the command being
+ * handled, rather than accessing the variable directly.  It may be moved.
+ */
+#define CMD_ARGC argc
+/**
+ * Use this macro to access the arguments for the command being handled,
+ * rather than accessing the variable directly.  It may be moved.
+ */
+#define CMD_ARGV args
 /**
  * Use this macro to access the name of the command being handled,
  * rather than accessing the variable directly.  It may be moved.
  */
-#define CMD_NAME args[-1]
+#define CMD_NAME CMD_ARGV[-1]
 
 
 /// The type signature for commands' handler functions.