misc fixups

.github/workflows/build-test.yml

@@ -14,13 +14,15 @@ jobs:
       with: 
         submodules: recursive
     - name: set up packages
-      run: sudo apt install meson ninja-build gcc libsdl2-dev libxxhash-dev
+      run: |
+          sudo apt-get update
+          sudo apt install meson ninja-build gcc libsdl2-dev libxxhash-dev
     - name: build release
       run: |
         meson setup build
         meson compile -C build
     - name: upload build
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: sleepdart-linux
         path: sleepdart
@@ -50,7 +52,7 @@ jobs:
         meson setup build
         meson compile -C build
     - name: upload build
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: sleepdart-windows
         path: sleepdart.exe

src/argparser.h

@@ -3,8 +3,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-typedef void (*ArgCallback_t)(void *value);
-
 enum ArgumentType
 {
     ARG_STRING = 0,
@@ -23,7 +21,6 @@ struct Argument
     bool positional;
     const char *help;
     void *result;
-    ArgCallback_t callback;
 };
 
 typedef struct ArgParser {

src/config_parser.c

@@ -231,7 +231,7 @@ int config_get_float(CfgData_t *cfg, const char *key, float *dest)
     return 0;
 }
 
-void config_set_str(CfgData_t *cfg, const char *key, char *value)
+void config_set_str(CfgData_t *cfg, const char *key, const char *value)
 {
     if (value == NULL) {
         return;

src/config_parser.h

@@ -37,6 +37,6 @@ int config_get_int(CfgData_t *cfg, const char *key, int *dest);
  * config value gets copied to dest */
 int config_get_float(CfgData_t *cfg, const char *key, float *dest);
 
-void config_set_str(CfgData_t *cfg, const char *key, char *value);
+void config_set_str(CfgData_t *cfg, const char *key, const char *value);
 void config_set_int(CfgData_t *cfg, const char *key, int value);
 void config_set_float(CfgData_t *cfg, const char *key, float value);

src/machine.c

@@ -217,7 +217,7 @@ int machine_do_cycles()
 
             audio_sdl_queue(m_cur->ay->buf, m_cur->ay->buf_len * sizeof(float));
 
-            ula_draw_frame(m_cur);
+            ula_draw_frame();
 
             video_sdl_draw_rgb24_buffer(ula_buffer, sizeof(ula_buffer));
 

src/machine_test.c

@@ -409,9 +409,9 @@ static void test_finish(struct Machine *m) {
     }
 }
 
-int machine_test_iterate(struct Machine *m)
+void machine_test_iterate(struct Machine *m)
 {
-    if (!test_running) return 0;
+    if (!test_running) return;
 
     if (test.cycles) {
         XXH64_update(test.cycles, &m->cpu.cycles, sizeof(m->cpu.cycles));

src/machine_test.h

@@ -3,5 +3,5 @@
 struct Machine;
 
 int machine_test_open(const char *path);
-int machine_test_iterate(struct Machine *m);
+void machine_test_iterate(struct Machine *m);
 void machine_test_close();