C API cleanup, feature additions

* Cleaned up usage of handles vs. handle pointers
* Store global string for last error thrown
* Removed uhd::device_addr_t handle, added std::vector<std::string> handle

1 files changed, 90 insertions, 0 deletions

diff --git a/host/tests/string_vector_c_test.c b/host/tests/string_vector_c_test.c
new file mode 100644
index 000000000..fe055fd91
--- /dev/null
+++ b/host/tests/string_vector_c_test.c
@@ -0,0 +1,90 @@
+//
+// Copyright 2015 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#include <uhd.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define UHD_TEST_EXECUTE_OR_GOTO(label, ...) \
+    if(__VA_ARGS__){ \
+        fprintf(stderr, "Error occurred at %s:%d\n", __FILE__, (__LINE__-1)); \
+        return_code = EXIT_FAILURE; \
+        goto label; \
+    }
+
+#define BUFFER_SIZE 1024
+
+int main(){
+
+    // Variables
+    int return_code;
+    uhd_string_vector_handle string_vector;
+    size_t size;
+    char str_buffer[BUFFER_SIZE];
+
+    return_code = EXIT_SUCCESS;
+
+    // Create string_vector
+    UHD_TEST_EXECUTE_OR_GOTO(end_of_test,
+        uhd_string_vector_make(&string_vector)
+    )
+
+    // Add values
+    UHD_TEST_EXECUTE_OR_GOTO(free_string_vector,
+        uhd_string_vector_push_back(&string_vector, "foo")
+    )
+    UHD_TEST_EXECUTE_OR_GOTO(free_string_vector,
+        uhd_string_vector_push_back(&string_vector, "bar")
+    )
+
+    // Check size
+    UHD_TEST_EXECUTE_OR_GOTO(free_string_vector,
+        uhd_string_vector_size(string_vector, &size)
+    )
+    if(size != 2){
+        return_code = EXIT_FAILURE;
+        fprintf(stderr, "%s:%d: Invalid size: %lu vs. 2",
+                        __FILE__, __LINE__,size);
+        goto free_string_vector;
+    }
+
+    // Make sure we get right value
+    UHD_TEST_EXECUTE_OR_GOTO(free_string_vector,
+        uhd_string_vector_at(string_vector, 1, str_buffer, BUFFER_SIZE)
+    )
+    if(strcmp(str_buffer, "bar")){
+        return_code = EXIT_FAILURE;
+        fprintf(stderr, "%s:%d: Mismatched daughterboard serial: \"%s\" vs. \"key3=value3,key4=value4\"\n",
+                        __FILE__, __LINE__,
+                        str_buffer);
+    }
+
+    free_string_vector:
+        if(return_code){
+            uhd_string_vector_last_error(string_vector, str_buffer, BUFFER_SIZE);
+            fprintf(stderr, "string_vector error: %s\n", str_buffer);
+        }
+        uhd_string_vector_free(&string_vector);
+
+    end_of_test:
+        if(!return_code){
+            printf("\nNo errors detected\n");
+        }
+        return return_code;
+}