Skip to content

Commit 12c6a54

Browse files
committed
thcrap_configure_v3: Remove ThcrapJanssonDll
1 parent 5812515 commit 12c6a54

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

thcrap_configure_v3/ThcrapDll.cs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@ public static T stack_json_resolve<T>(string fn)
104104
if (janssonObj == IntPtr.Zero)
105105
return default;
106106

107-
uint bufferSize = ThcrapJanssonDll.json_dumpb(janssonObj, IntPtr.Zero, 0, 0);
107+
uint bufferSize = ThcrapDll.json_dumpb(janssonObj, IntPtr.Zero, 0, 0);
108108
IntPtr bufferPtr = Marshal.AllocHGlobal((int)bufferSize);
109-
ThcrapJanssonDll.json_dumpb(janssonObj, bufferPtr, bufferSize, 0);
110-
ThcrapJanssonDll.json_delete(janssonObj);
109+
ThcrapDll.json_dumpb(janssonObj, bufferPtr, bufferSize, 0);
110+
ThcrapDll.json_delete(janssonObj);
111111

112112
byte[] bufferArray = new byte[bufferSize];
113113
Marshal.Copy(bufferPtr, bufferArray, 0, (int)bufferSize);
@@ -359,11 +359,6 @@ public static extern int update_filter_global_wrapper(
359359
public static extern int update_filter_games_wrapper(
360360
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(ThcrapHelper.UTF8StringMarshaler))] string fn,
361361
IntPtr games);
362-
}
363-
364-
class ThcrapJanssonDll
365-
{
366-
public const string DLL = ThcrapDll.THCRAP_DLL_PATH + "jansson" + ThcrapDll.DEBUG_OR_RELEASE + ".dll";
367362
[DllImport(DLL, CallingConvention = CallingConvention.Cdecl)]
368363
public static extern uint json_dumpb(IntPtr /* json_t * */ json, IntPtr /* char* */ buffer, uint size, uint flags);
369364
// Not part of the public jansson API, but json_decref is defined as an inline function

0 commit comments

Comments
 (0)