From 6096c1387cd97f1fd654520b765af93a040c9fa5 Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Fri, 24 May 2019 16:49:25 +0200 Subject: teah_common.h -> taler_curl_lib.h --- src/bank-lib/bank_api_admin.c | 2 +- src/include/Makefile.am | 2 +- src/include/taler_curl_lib.h | 78 +++++++++++++++++++++++++++++++++++++++++++ src/include/teah_common.h | 78 ------------------------------------------- src/lib/Makefile.am | 4 +-- src/lib/auditor_api_handle.h | 2 +- src/lib/exchange_api_handle.c | 2 +- src/lib/exchange_api_handle.h | 2 +- src/lib/teah_common.c | 2 +- 9 files changed, 86 insertions(+), 86 deletions(-) create mode 100644 src/include/taler_curl_lib.h delete mode 100644 src/include/teah_common.h (limited to 'src') diff --git a/src/bank-lib/bank_api_admin.c b/src/bank-lib/bank_api_admin.c index d9821a38b..a70eb0ea4 100644 --- a/src/bank-lib/bank_api_admin.c +++ b/src/bank-lib/bank_api_admin.c @@ -24,7 +24,7 @@ #include /* just for HTTP status codes */ #include "taler_signatures.h" // FIXME(dold): temporary hack -#include "teah_common.h" +#include "taler_curl_lib.h" /** diff --git a/src/include/Makefile.am b/src/include/Makefile.am index 2d5724de6..49f2b5a41 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -31,7 +31,7 @@ talerinclude_HEADERS = \ taler_wire_lib.h \ taler_wire_plugin.h \ taler_testing_bank_lib.h \ - teah_common.h + taler_curl_lib.h endif diff --git a/src/include/taler_curl_lib.h b/src/include/taler_curl_lib.h new file mode 100644 index 000000000..2d69768cc --- /dev/null +++ b/src/include/taler_curl_lib.h @@ -0,0 +1,78 @@ +/* + This file is part of TALER + Copyright (C) 2019 GNUnet e.V. + + TALER is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3, or (at your + option) any later version. + + TALER is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with TALER; see the file COPYING. If not, see + +*/ +/** + * @file lib/taler_curl_lib.h + * @brief Helper routines shared by libtalerexchange and libtalerauditor + * @author Christian Grothoff + */ +#ifndef TEAH_COMMON_H +#define TEAH_COMMON_H + +#include +#include "taler_json_lib.h" + +/** + * Should we compress PUT/POST bodies with 'deflate' encoding? + */ +#define COMPRESS_BODIES 1 + +/** + * State used for #TEAL_curl_easy_post() and + * #TEAL_curl_easy_post_finished(). + */ +struct TEAH_PostContext +{ + /** + * JSON encoding of the request to POST. + */ + char *json_enc; + + /** + * Custom headers. + */ + struct curl_slist *headers; +}; + + +/** + * Add the @a body as POST data to the easy handle in + * @a ctx. + * + * @param ctx[in,out] a request context (updated) + * @param eh easy handle to use + * @param body JSON body to add to @e ctx + * @return #GNUNET_OK on success #GNUNET_SYSERR on failure + */ +int +TALER_curl_easy_post (struct TEAH_PostContext *ctx, + CURL *eh, + const json_t *body); + + +/** + * Free the data in @a ctx. + * + * @param ctx[in] a request context (updated) + */ +void +TALER_curl_easy_post_finished (struct TEAH_PostContext *ctx); + + + +#endif diff --git a/src/include/teah_common.h b/src/include/teah_common.h deleted file mode 100644 index d4d24da40..000000000 --- a/src/include/teah_common.h +++ /dev/null @@ -1,78 +0,0 @@ -/* - This file is part of TALER - Copyright (C) 2019 GNUnet e.V. - - TALER is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. - - TALER is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with TALER; see the file COPYING. If not, see - -*/ -/** - * @file lib/teah_common.h - * @brief Helper routines shared by libtalerexchange and libtalerauditor - * @author Christian Grothoff - */ -#ifndef TEAH_COMMON_H -#define TEAH_COMMON_H - -#include -#include "taler_json_lib.h" - -/** - * Should we compress PUT/POST bodies with 'deflate' encoding? - */ -#define COMPRESS_BODIES 1 - -/** - * State used for #TEAL_curl_easy_post() and - * #TEAL_curl_easy_post_finished(). - */ -struct TEAH_PostContext -{ - /** - * JSON encoding of the request to POST. - */ - char *json_enc; - - /** - * Custom headers. - */ - struct curl_slist *headers; -}; - - -/** - * Add the @a body as POST data to the easy handle in - * @a ctx. - * - * @param ctx[in,out] a request context (updated) - * @param eh easy handle to use - * @param body JSON body to add to @e ctx - * @return #GNUNET_OK on success #GNUNET_SYSERR on failure - */ -int -TALER_curl_easy_post (struct TEAH_PostContext *ctx, - CURL *eh, - const json_t *body); - - -/** - * Free the data in @a ctx. - * - * @param ctx[in] a request context (updated) - */ -void -TALER_curl_easy_post_finished (struct TEAH_PostContext *ctx); - - - -#endif diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 0aa78d7b8..33d4f3277 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -28,7 +28,7 @@ libtalerexchange_la_SOURCES = \ exchange_api_track_transaction.c \ exchange_api_track_transfer.c \ exchange_api_wire.c \ - teah_common.c teah_common.h + teah_common.c libtalerexchange_la_LIBADD = \ libtalerauditor.la \ $(top_builddir)/src/json/libtalerjson.la \ @@ -48,7 +48,7 @@ libtalerauditor_la_SOURCES = \ auditor_api_handle.c auditor_api_handle.h \ auditor_api_deposit_confirmation.c \ auditor_api_exchanges.c \ - teah_common.c teah_common.h + teah_common.c libtalerauditor_la_LIBADD = \ $(top_builddir)/src/json/libtalerjson.la \ $(top_builddir)/src/util/libtalerutil.la \ diff --git a/src/lib/auditor_api_handle.h b/src/lib/auditor_api_handle.h index c053cbbc0..eac007c45 100644 --- a/src/lib/auditor_api_handle.h +++ b/src/lib/auditor_api_handle.h @@ -22,7 +22,7 @@ #include "platform.h" #include #include "taler_auditor_service.h" -#include "teah_common.h" +#include "taler_curl_lib.h" /** * Get the context of a auditor. diff --git a/src/lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c index fbff68d1b..659301d41 100644 --- a/src/lib/exchange_api_handle.c +++ b/src/lib/exchange_api_handle.c @@ -33,7 +33,7 @@ #include "exchange_api_handle.h" #include "exchange_api_curl_defaults.h" #include "backoff.h" -#include "teah_common.h" +#include "taler_curl_lib.h" /** * Which revision of the Taler protocol is implemented diff --git a/src/lib/exchange_api_handle.h b/src/lib/exchange_api_handle.h index 6bb3fff28..81e6d7c5e 100644 --- a/src/lib/exchange_api_handle.h +++ b/src/lib/exchange_api_handle.h @@ -24,7 +24,7 @@ #include "taler_auditor_service.h" #include "taler_exchange_service.h" #include "taler_crypto_lib.h" -#include "teah_common.h" +#include "taler_curl_lib.h" /** * Entry in DLL of auditors used by an exchange. diff --git a/src/lib/teah_common.c b/src/lib/teah_common.c index 3a0b293a4..8377c4789 100644 --- a/src/lib/teah_common.c +++ b/src/lib/teah_common.c @@ -23,7 +23,7 @@ * @author Christian Grothoff */ #include "platform.h" -#include "teah_common.h" +#include "taler_curl_lib.h" #if COMPRESS_BODIES #include -- cgit v1.2.3