remove remaining scope_remove_xxx leftovers from the original prototype

Author: jpnurmi

include/sentry.h

@@ -1591,7 +1591,6 @@ SENTRY_API void sentry_scope_set_user(
  * Removes a user.
  */
 SENTRY_API void sentry_remove_user(void);
-SENTRY_API void sentry_scope_remove_user(sentry_scope_t *scope);
 
 /**
  * Sets a tag.
@@ -1609,9 +1608,6 @@ SENTRY_API void sentry_scope_set_tag_n(sentry_scope_t *scope, const char *key,
  */
 SENTRY_API void sentry_remove_tag(const char *key);
 SENTRY_API void sentry_remove_tag_n(const char *key, size_t key_len);
-SENTRY_API void sentry_scope_remove_tag(sentry_scope_t *scope, const char *key);
-SENTRY_API void sentry_scope_remove_tag_n(
-    sentry_scope_t *scope, const char *key, size_t key_len);
 
 /**
  * Sets extra information.
@@ -1629,10 +1625,6 @@ SENTRY_API void sentry_scope_set_extra_n(sentry_scope_t *scope, const char *key,
  */
 SENTRY_API void sentry_remove_extra(const char *key);
 SENTRY_API void sentry_remove_extra_n(const char *key, size_t key_len);
-SENTRY_API void sentry_scope_remove_extra(
-    sentry_scope_t *scope, const char *key);
-SENTRY_API void sentry_scope_remove_extra_n(
-    sentry_scope_t *scope, const char *key, size_t key_len);
 
 /**
  * Sets a context object.
@@ -1650,10 +1642,6 @@ SENTRY_API void sentry_scope_set_context_n(sentry_scope_t *scope,
  */
 SENTRY_API void sentry_remove_context(const char *key);
 SENTRY_API void sentry_remove_context_n(const char *key, size_t key_len);
-SENTRY_API void sentry_scope_remove_context(
-    sentry_scope_t *scope, const char *key);
-SENTRY_API void sentry_scope_remove_context_n(
-    sentry_scope_t *scope, const char *key, size_t key_len);
 
 /**
  * Sets the event fingerprint.
@@ -1673,7 +1661,6 @@ SENTRY_API void sentry_scope_set_fingerprint_n(sentry_scope_t *scope,
  * Removes the fingerprint.
  */
 SENTRY_API void sentry_remove_fingerprint(void);
-SENTRY_API void sentry_scope_remove_fingerprint(sentry_scope_t *scope);
 
 /**
  * Set the trace. The primary use for this is to allow other SDKs to propagate

src/sentry_core.c

@@ -798,15 +798,15 @@ void
 sentry_remove_tag(const char *key)
 {
     SENTRY_WITH_SCOPE_MUT (scope) {
-        sentry_scope_remove_tag(scope, key);
+        sentry_value_remove_by_key(scope->tags, key);
     }
 }
 
 void
 sentry_remove_tag_n(const char *key, size_t key_len)
 {
     SENTRY_WITH_SCOPE_MUT (scope) {
-        sentry_scope_remove_tag_n(scope, key, key_len);
+        sentry_value_remove_by_key_n(scope->tags, key, key_len);
     }
 }
 
@@ -830,15 +830,15 @@ void
 sentry_remove_extra(const char *key)
 {
     SENTRY_WITH_SCOPE_MUT (scope) {
-        sentry_scope_remove_extra(scope, key);
+        sentry_value_remove_by_key(scope->extra, key);
     }
 }
 
 void
 sentry_remove_extra_n(const char *key, size_t key_len)
 {
     SENTRY_WITH_SCOPE_MUT (scope) {
-        sentry_scope_remove_extra_n(scope, key, key_len);
+        sentry_value_remove_by_key_n(scope->extra, key, key_len);
     }
 }
 
@@ -870,15 +870,15 @@ void
 sentry_remove_context(const char *key)
 {
     SENTRY_WITH_SCOPE_MUT (scope) {
-        sentry_scope_remove_context(scope, key);
+        sentry_value_remove_by_key(scope->contexts, key);
     }
 }
 
 void
 sentry_remove_context_n(const char *key, size_t key_len)
 {
     SENTRY_WITH_SCOPE_MUT (scope) {
-        sentry_scope_remove_context_n(scope, key, key_len);
+        sentry_value_remove_by_key_n(scope->contexts, key, key_len);
     }
 }
 

src/sentry_scope.c

@@ -530,12 +530,6 @@ sentry_scope_set_user(sentry_scope_t *scope, sentry_value_t user)
     scope->user = user;
 }
 
-void
-sentry_scope_remove_user(sentry_scope_t *scope)
-{
-    sentry_scope_set_user(scope, sentry_value_new_null());
-}
-
 void
 sentry_scope_set_tag(sentry_scope_t *scope, const char *key, const char *value)
 {
@@ -550,19 +544,6 @@ sentry_scope_set_tag_n(sentry_scope_t *scope, const char *key, size_t key_len,
         scope->tags, key, key_len, sentry_value_new_string_n(value, value_len));
 }
 
-void
-sentry_scope_remove_tag(sentry_scope_t *scope, const char *key)
-{
-    sentry_value_remove_by_key(scope->tags, key);
-}
-
-void
-sentry_scope_remove_tag_n(
-    sentry_scope_t *scope, const char *key, size_t key_len)
-{
-    sentry_value_remove_by_key_n(scope->tags, key, key_len);
-}
-
 void
 sentry_scope_set_extra(
     sentry_scope_t *scope, const char *key, sentry_value_t value)
@@ -577,19 +558,6 @@ sentry_scope_set_extra_n(sentry_scope_t *scope, const char *key, size_t key_len,
     sentry_value_set_by_key_n(scope->extra, key, key_len, value);
 }
 
-void
-sentry_scope_remove_extra(sentry_scope_t *scope, const char *key)
-{
-    sentry_value_remove_by_key(scope->extra, key);
-}
-
-void
-sentry_scope_remove_extra_n(
-    sentry_scope_t *scope, const char *key, size_t key_len)
-{
-    sentry_value_remove_by_key_n(scope->extra, key, key_len);
-}
-
 void
 sentry_scope_set_context(
     sentry_scope_t *scope, const char *key, sentry_value_t value)
@@ -604,19 +572,6 @@ sentry_scope_set_context_n(sentry_scope_t *scope, const char *key,
     sentry_value_set_by_key_n(scope->contexts, key, key_len, value);
 }
 
-void
-sentry_scope_remove_context(sentry_scope_t *scope, const char *key)
-{
-    sentry_value_remove_by_key(scope->contexts, key);
-}
-
-void
-sentry_scope_remove_context_n(
-    sentry_scope_t *scope, const char *key, size_t key_len)
-{
-    sentry_value_remove_by_key_n(scope->contexts, key, key_len);
-}
-
 void
 sentry__scope_set_fingerprint_va(
     sentry_scope_t *scope, const char *fingerprint, va_list va)
@@ -669,13 +624,6 @@ sentry_scope_set_fingerprint_n(
     va_end(va);
 }
 
-void
-sentry_scope_remove_fingerprint(sentry_scope_t *scope)
-{
-    sentry_value_decref(scope->fingerprint);
-    scope->fingerprint = sentry_value_new_null();
-}
-
 void
 sentry_scope_set_transaction(sentry_scope_t *scope, const char *transaction)
 {