logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0001-Reuse-dynbuf-symbols-for-curl-tool.patch (1772B)


  1. From 0c83f671f4f2a1b556a2f6a0cfd664cd13b077e0 Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Fri, 16 Oct 2020 19:09:50 -0700
  4. Subject: [PATCH] Reuse dynbuf symbols for curl tool
  5. ---
  6. lib/dynbuf.h | 26 ++++++++++++--------------
  7. 1 file changed, 12 insertions(+), 14 deletions(-)
  8. diff --git a/lib/dynbuf.h b/lib/dynbuf.h
  9. index 31a913019..deabeb0e6 100644
  10. --- a/lib/dynbuf.h
  11. +++ b/lib/dynbuf.h
  12. @@ -26,23 +26,21 @@
  13. #include <curl/curl.h>
  14. -#ifndef BUILDING_LIBCURL
  15. /* this renames the functions so that the tool code can use the same code
  16. without getting symbol collisions */
  17. -#define Curl_dyn_init(a,b) curlx_dyn_init(a,b)
  18. -#define Curl_dyn_add(a,b) curlx_dyn_add(a,b)
  19. -#define Curl_dyn_addn(a,b,c) curlx_dyn_addn(a,b,c)
  20. -#define Curl_dyn_addf curlx_dyn_addf
  21. -#define Curl_dyn_vaddf curlx_dyn_vaddf
  22. -#define Curl_dyn_free(a) curlx_dyn_free(a)
  23. -#define Curl_dyn_ptr(a) curlx_dyn_ptr(a)
  24. -#define Curl_dyn_uptr(a) curlx_dyn_uptr(a)
  25. -#define Curl_dyn_len(a) curlx_dyn_len(a)
  26. -#define Curl_dyn_reset(a) curlx_dyn_reset(a)
  27. -#define Curl_dyn_tail(a,b) curlx_dyn_tail(a,b)
  28. -#define Curl_dyn_setlen(a,b) curlx_dyn_setlen(a,b)
  29. +#define curlx_dyn_init Curl_dyn_init
  30. +#define curlx_dyn_add Curl_dyn_add
  31. +#define curlx_dyn_addn Curl_dyn_addn
  32. +#define curlx_dyn_addf Curl_dyn_addf
  33. +#define curlx_dyn_vaddf Curl_dyn_vaddf
  34. +#define curlx_dyn_free Curl_dyn_free
  35. +#define curlx_dyn_ptr Curl_dyn_ptr
  36. +#define curlx_dyn_uptr Curl_dyn_uptr
  37. +#define curlx_dyn_len Curl_dyn_len
  38. +#define curlx_dyn_reset Curl_dyn_reset
  39. +#define curlx_dyn_tail Curl_dyn_tail
  40. +#define curlx_dyn_setlen Curl_dyn_setlen
  41. #define curlx_dynbuf dynbuf /* for the struct name */
  42. -#endif
  43. struct dynbuf {
  44. char *bufr; /* point to a null-terminated allocated buffer */
  45. --
  46. 2.42.0