Revert sentry_uuid changes

Author: jpnurmi

src/sentry_database.c

@@ -99,29 +99,40 @@ sentry__run_free(sentry_run_t *run)
     sentry_free(run);
 }
 
-bool
-sentry__run_write_envelope(
-    const sentry_run_t *run, const sentry_envelope_t *envelope)
+static sentry_path_t *
+write_envelope(const sentry_path_t *path, const sentry_envelope_t *envelope)
 {
+    // 37 for the uuid, 9 for the `.envelope` suffix
+    char envelope_filename[37 + 9];
     sentry_uuid_t event_id = sentry__envelope_get_event_id(envelope);
-    char *envelope_filename = sentry__uuid_as_filename(&event_id, ".envelope");
+    sentry_uuid_as_string(&event_id, envelope_filename);
+    strcpy(&envelope_filename[36], ".envelope");
 
-    sentry_path_t *output_path
-        = sentry__path_join_str(run->run_path, envelope_filename);
-    sentry_free(envelope_filename);
+    sentry_path_t *output_path = sentry__path_join_str(path, envelope_filename);
     if (!output_path) {
-        return false;
+        return NULL;
     }
 
     int rv = sentry_envelope_write_to_path(envelope, output_path);
-    sentry__path_free(output_path);
-
     if (rv) {
         SENTRY_WARN("writing envelope to file failed");
+        sentry__path_free(output_path);
+        return NULL;
     }
 
-    // the `write_to_path` returns > 0 on failure, but we would like a real bool
-    return !rv;
+    return output_path;
+}
+
+bool
+sentry__run_write_envelope(
+    const sentry_run_t *run, const sentry_envelope_t *envelope)
+{
+    sentry_path_t *output_path = write_envelope(run->run_path, envelope);
+    if (output_path) {
+        sentry__path_free(output_path);
+        return true;
+    }
+    return false;
 }
 
 sentry_path_t *
@@ -134,25 +145,7 @@ sentry__run_write_feedback(
         return NULL;
     }
 
-    sentry_uuid_t event_id = sentry__envelope_get_event_id(envelope);
-    char *envelope_filename = sentry__uuid_as_filename(&event_id, ".envelope");
-
-    sentry_path_t *output_path
-        = sentry__path_join_str(run->feedback_path, envelope_filename);
-    sentry_free(envelope_filename);
-    if (!output_path) {
-        return NULL;
-    }
-
-    int rv = sentry_envelope_write_to_path(envelope, output_path);
-    sentry__path_free(output_path);
-
-    if (rv) {
-        SENTRY_WARN("writing envelope to file failed");
-    }
-
-    // the `write_to_path` returns > 0 on failure, but we would like a real bool
-    return !rv ? output_path : NULL;
+    return write_envelope(run->feedback_path, envelope);
 }
 
 bool

src/sentry_uuid.c

@@ -1,7 +1,6 @@
 #include "sentry_boot.h"
 
 #include "sentry_random.h"
-#include "sentry_string.h"
 #include "sentry_uuid.h"
 #include <stdio.h>
 #include <string.h>
@@ -130,24 +129,6 @@ sentry__span_uuid_as_string(const sentry_uuid_t *uuid, char str[17])
 #undef B
 }
 
-char *
-sentry__uuid_as_filename(const sentry_uuid_t *uuid, const char *suffix)
-{
-    // 36 for the uuid, suffix, and a null terminator
-    size_t suffix_len = sentry__guarded_strlen(suffix);
-    char *buf = sentry_malloc(36 + suffix_len + 1);
-    if (!buf) {
-        return NULL;
-    }
-    sentry_uuid_as_string(uuid, buf);
-    buf[36] = '\0';
-    if (suffix_len > 0) {
-        memcpy(buf + 36, suffix, suffix_len);
-        buf[36 + suffix_len] = '\0';
-    }
-    return buf;
-}
-
 #ifdef SENTRY_PLATFORM_WINDOWS
 sentry_uuid_t
 sentry__uuid_from_native(const GUID *guid)

src/sentry_uuid.h

@@ -13,18 +13,11 @@ void sentry__internal_uuid_as_string(const sentry_uuid_t *uuid, char str[37]);
  * Converts a sentry UUID to a string representation used for span IDs.
  */
 void sentry__span_uuid_as_string(const sentry_uuid_t *uuid, char str[17]);
-
-/**
- * Converts a sentry UUID to a string representation used for a filename with
- * the given suffix.
- */
-char *sentry__uuid_as_filename(const sentry_uuid_t *uuid, const char *suffix);
+#endif
 
 #ifdef SENTRY_PLATFORM_WINDOWS
 /**
  * Create a new UUID from the windows-native GUID type.
  */
 sentry_uuid_t sentry__uuid_from_native(const GUID *guid);
 #endif
-
-#endif