Converting to C++.

Author: wolfmcnally

src/format-ints.cpp

@@ -9,10 +9,10 @@
 #include "params.h"
 #include "utils.h"
 
-typedef struct format_ints_options_t {
+struct format_ints_options {
     size_t low;
     size_t high;
-} format_ints_options;
+};
 
 void format_ints_process_output(format* f, params* p) {
     format_ints_options* opts = (format_ints_options*)f->format_options;

src/format-slip39.cpp

@@ -19,11 +19,11 @@ bool format_slip39_is_seed_length_valid(size_t seed_len) {
     return true;
 }
 
-typedef struct format_slip39_options_t {
+struct format_slip39_options {
     group_descriptor groups[16];
     size_t groups_count;
     size_t groups_threshold;
-} format_slip39_options;
+};
 
 void format_slip39_process_output(format* f, params* p) {
     if(!format_slip39_is_seed_length_valid(p->seed_len)) { return; }

src/format.h

@@ -8,13 +8,13 @@
 #ifndef FORMAT_H
 #define FORMAT_H
 
-typedef struct params_t params;
-typedef struct format_t format;
+struct params;
+struct format;
 
 typedef void (*format_func)(format*);
 typedef void (*format_processor)(format*, params*);
 
-typedef enum format_key_t {
+enum format_key {
     format_key_unknown = -1,
     format_key_random,
     format_key_hex,
@@ -26,17 +26,17 @@ typedef enum format_key_t {
     format_key_ints,
     format_key_bip39,
     format_key_slip39
-} format_key;
+};
 
-typedef struct format_t {
+struct format {
     format_key key;
     const char* name;
     format_processor process_input;
     format_processor process_output;
     format_func validate;
     format_func dispose;
     void* format_options;
-} format;
+};
 
 void format_dispose(format* f);
 

src/params.h

@@ -17,7 +17,7 @@
 
 #define MAX_ARGS 256
 
-typedef struct raw_params_t {
+struct raw_params {
     const char* input_format;
     const char* output_format;
     const char* count;
@@ -33,15 +33,15 @@ typedef struct raw_params_t {
 
     const char* args[MAX_ARGS];
     size_t args_count;
-} raw_params;
+};
 
-typedef struct format_t format;
+struct format;
 
-typedef struct params_t {
-    format* input_format;
+struct params {
+    struct format* input_format;
     char* input;
 
-    format* output_format;
+    struct format* output_format;
     char* output;
 
     uint8_t* seed;
@@ -51,10 +51,10 @@ typedef struct params_t {
     char* deterministic_seed;
     random_generator rng;
 
-    raw_params* raw;
-} params;
+    struct raw_params* raw;
+};
 
-params* params_parse( int argc, char *argv[] );
-void params_dispose(params*);
+struct params* params_parse( int argc, char *argv[] );
+void params_dispose(struct params*);
 
 #endif /* PARAMS_H */