libstore-c: remove nix_derivation_output

Author: RossComputerGuy

src/libstore-c/nix_api_store.cc

@@ -333,8 +333,7 @@ nix_err nix_derivation_get_outputs_and_optpaths(
     nix_c_context * context,
     const nix_derivation * drv,
     const Store * store,
-    void (*callback)(
-        void * userdata, const char * name, const nix_derivation_output * drv_output, const StorePath * path),
+    void (*callback)(void * userdata, const char * name, const StorePath * path),
     void * userdata)
 {
     if (context)
@@ -343,28 +342,16 @@ nix_err nix_derivation_get_outputs_and_optpaths(
         auto value = drv->drv.outputsAndOptPaths(store->ptr->config);
         if (callback) {
             for (const auto & [name, result] : value) {
-                const nix_derivation_output tmp_output{result.first};
-
                 if (auto store_path = result.second) {
                     const StorePath tmp_path{*store_path};
-                    callback(userdata, name.c_str(), &tmp_output, &tmp_path);
+                    callback(userdata, name.c_str(), &tmp_path);
                 } else {
-                    callback(userdata, name.c_str(), &tmp_output, nullptr);
+                    callback(userdata, name.c_str(), nullptr);
                 }
             }
         }
     }
     NIXC_CATCH_ERRS
 }
 
-nix_derivation_output * nix_derivation_output_clone(const nix_derivation_output * o)
-{
-    return new nix_derivation_output{o->drv_out};
-}
-
-void nix_derivation_output_free(nix_derivation_output * o)
-{
-    delete o;
-}
-
 } // extern "C"

src/libstore-c/nix_api_store.h

@@ -25,8 +25,6 @@ typedef struct Store Store;
 typedef struct StorePath StorePath;
 /** @brief Nix Derivation */
 typedef struct nix_derivation nix_derivation;
-/** @brief Nix Derivation Output */
-typedef struct nix_derivation_output nix_derivation_output;
 
 /**
  * @brief Initializes the Nix store library
@@ -352,26 +350,9 @@ nix_err nix_derivation_get_outputs_and_optpaths(
     nix_c_context * context,
     const nix_derivation * drv,
     const Store * store,
-    void (*callback)(
-        void * userdata, const char * name, const nix_derivation_output * drv_output, const StorePath * path),
+    void (*callback)(void * userdata, const char * name, const StorePath * path),
     void * userdata);
 
-/**
- * @brief Copy of a 'nix_derivation_output'
- *
- * @param[in] o the derivation output to copy
- * @return a new 'nix_derivation_output'
- */
-nix_derivation_output * nix_derivation_output_clone(const nix_derivation_output * o);
-
-/**
- * @brief Deallocate a 'nix_derivation_output'
- *
- * Does not fail.
- * @param[in] o the derivation output to free
- */
-void nix_derivation_output_free(nix_derivation_output * o);
-
 // cffi end
 #ifdef __cplusplus
 }

src/libstore-c/nix_api_store_internal.h

@@ -20,11 +20,6 @@ struct nix_derivation
     nix::Derivation drv;
 };
 
-struct nix_derivation_output
-{
-    nix::DerivationOutput drv_out;
-};
-
 } // extern "C"
 
 #endif