halcmd: convert halcmd_commands to C++

Signed-off-by: Jeff Epler <jepler@unpythonic.net>

Author: jepler

src/hal/utils/Submakefile

@@ -1,5 +1,5 @@
-HALCMDSRCS := hal/utils/halcmd.c hal/utils/halcmd_commands.c hal/utils/halcmd_main.c
-HALSHSRCS := hal/utils/halcmd.c hal/utils/halcmd_commands.c hal/utils/halsh.c
+HALCMDSRCS := hal/utils/halcmd.c hal/utils/halcmd_commands.cc hal/utils/halcmd_main.c
+HALSHSRCS := hal/utils/halcmd.c hal/utils/halcmd_commands.cc hal/utils/halsh.c
 
 ifneq ($(READLINE_LIBS),)
 HALCMDSRCS += hal/utils/halcmd_completion.c
@@ -10,12 +10,12 @@ $(call TOOBJSDEPS, $(HALSHSRCS)) : EXTRAFLAGS = -fPIC
 $(call TOOBJSDEPS, hal/utils/halsh.c) : EXTRAFLAGS += $(TCL_CFLAGS)
 ../tcl/hal.so: $(call TOOBJS, $(HALSHSRCS)) ../lib/liblinuxcncini.so.0 ../lib/liblinuxcnchal.so.0
 	$(ECHO) Linking $(notdir $@)
-	$(Q)$(CC) $(LDFLAGS) -shared $^  $(TCL_LIBS) -o $@
+	$(Q)$(CXX) $(LDFLAGS) -shared $^  $(TCL_LIBS) -o $@
 TARGETS += ../tcl/hal.so
 
 ../bin/halcmd: $(call TOOBJS, $(HALCMDSRCS)) ../lib/liblinuxcncini.so.0 ../lib/liblinuxcnchal.so.0 
 	$(ECHO) Linking $(notdir $@)
-	$(Q)$(CC) $(LDFLAGS) -o $@ $^ $(READLINE_LIBS)
+	$(Q)$(CXX) $(LDFLAGS) -o $@ $^ $(READLINE_LIBS)
 TARGETS += ../bin/halcmd
 
 HALRMTSRCS := hal/utils/halrmt.c

src/hal/utils/halcmd_commands.c src/hal/utils/halcmd_commands.ccsrc/hal/utils/halcmd_commands.c renamed to src/hal/utils/halcmd_commands.cc

@@ -75,7 +75,6 @@ static void print_param_names(char **patterns);
 static void print_funct_names(char **patterns);
 static void print_thread_names(char **patterns);
 static void print_lock_status();
-static int count_list(int list_root);
 static void print_mem_status();
 static const char *data_type(int type);
 static const char *data_type2(int type);
@@ -1173,7 +1172,7 @@ int do_loadrt_cmd(char *mod_name, char *args[])
 	strncat(arg_string, " ", MAX_CMD_LEN);
     }
     /* allocate HAL shmem for the string */
-    cp1 = hal_malloc(strlen(arg_string)+1);
+    cp1 = (char*)hal_malloc(strlen(arg_string)+1);
     if ( cp1 == NULL ) {
 	halcmd_error("failed to allocate memory for module args\n");
 	return -1;
@@ -2136,16 +2135,18 @@ static void print_lock_status()
 	halcmd_output("  HAL_LOCK_RUN     - running/stopping HAL is locked\n");
 }
 
-static int count_list(int list_root)
+template<class T>
+int count_list(SHMFIELD(T) list_root)
 {
-    int n, next;
+    int n;
+    SHMFIELD(T) next;
 
     rtapi_mutex_get(&(hal_data->mutex));
     next = list_root;
     n = 0;
     while (next != 0) {
 	n++;
-	next = *((int *) SHMPTR(next));
+	next = SHMPTR(next)->next_ptr;
     }
     rtapi_mutex_give(&(hal_data->mutex));
     return n;