[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-mdb] 16/93: merged jsonIntegrity
From: |
gnunet |
Subject: |
[taler-taler-mdb] 16/93: merged jsonIntegrity |
Date: |
Mon, 18 Nov 2019 21:12:39 +0100 |
This is an automated email from the git hooks/post-receive script.
marco-boss pushed a commit to branch master
in repository taler-mdb.
commit 66cae837bbdfc9fa67f5d2923694c25f976233ad
Merge: 0c551b6 b608bf0
Author: BOSS_Marco <address@hidden>
AuthorDate: Fri Nov 1 11:02:19 2019 +0100
merged jsonIntegrity
src/communication.c | 280 +++++++++++++++++++++++++++++-----------------------
src/communication.h | 2 +-
src/configuration.h | 38 ++++---
src/main.c | 43 ++++----
src/nfc.c | 22 +++--
src/product.c | 48 ++++++---
src/wallet.c | 2 +-
src/wallet.h | 12 ---
8 files changed, 256 insertions(+), 191 deletions(-)
diff --cc src/communication.c
index db74106,b0fa7ad..69d874b
--- a/src/communication.c
+++ b/src/communication.c
@@@ -49,20 -50,19 +50,18 @@@ int taler_init(CURL **curl
return EXIT_SUCCESS;
}
--
- void taler_exit (CURL **curl)
+ void taler_exit( CURL **curl )
{
- curl_easy_cleanup (*curl);
- curl_global_cleanup ();
+ curl_easy_cleanup(*curl);
+ curl_global_cleanup();
}
- int taler_alloc_string (char **string, size_t size)
+ int taler_alloc_string( char **string, size_t size )
{
- *string = malloc (size);
- if ( ! (*string) )
- {
- printf ("taler_alloc: unable to allocate string");
- exit (EXIT_FAILURE);
+ *string = malloc( size );
+ if( !(*string) ){
+ printf( "taler_alloc: unable to allocate string" );
+ exit( EXIT_FAILURE );
}
return EXIT_SUCCESS;
}
@@@ -228,7 -262,10 +261,8 @@@ int taler_parse_json( const TalerRespon
return EXIT_FAILURE;
}
*returnStr = temp;
- strcpy (*returnStr, result);
+ strcpy( *returnStr, result );
+ json_decref( root );
return EXIT_SUCCESS;
}
-
-
diff --cc src/main.c
index 8fff739,493d490..cf170ff
--- a/src/main.c
+++ b/src/main.c
@@@ -52,7 -52,7 +52,8 @@@ void *start_nfc_transmission (void *ign
{
printf ("Error setting thread cancelling type\n");
}
- // start endless transmission loop (until threads gets cancelled)
++
+ /* start endless transmission loop (until threads gets cancelled) */
while ( 1 )
{
if ( pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, NULL) != 0 )
@@@ -151,7 -151,13 +152,12 @@@ int main (
}
printf ("Order no.: %s paid!\n\n", product.orderID);
- // send cancel request to nfc thread
-
+ /* -----------------
+ Here comes the code for releasing the product
+ ----------------- */
+
+
+ /* send cancel request to nfc thread */
while ( pthread_cancel (nfcThread) != 0 )
{
printf ("Error sending cancel request to thread for nfc transmission");
diff --cc src/wallet.c
index 1233223,24f34c8..6e19b2c
--- a/src/wallet.c
+++ b/src/wallet.c
@@@ -28,8 -28,9 +28,8 @@@ along wit
#include <string.h>
#include "wallet.h"
-
+ #include "configuration.h"
-
int wallet_select_aid (nfc_device *pnd)
{
uint8_t response[] = { 0x00, 0x00 };
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [taler-taler-mdb] 06/93: updated .gitignore, (continued)
- [taler-taler-mdb] 06/93: updated .gitignore, gnunet, 2019/11/18
- [taler-taler-mdb] 02/93: add bootstrap and uncrustify logic, gnunet, 2019/11/18
- [taler-taler-mdb] 08/93: json parsing and creating now done with libjannson, gnunet, 2019/11/18
- [taler-taler-mdb] 03/93: fix nfc and other build issues, gnunet, 2019/11/18
- [taler-taler-mdb] 07/93: first includes of libjansson, gnunet, 2019/11/18
- [taler-taler-mdb] 11/93: fix nfc and other build issues, gnunet, 2019/11/18
- [taler-taler-mdb] 04/93: initial indenting, gnunet, 2019/11/18
- [taler-taler-mdb] 01/93: revisit build system, except for libnfc should work, gnunet, 2019/11/18
- [taler-taler-mdb] 09/93: revisit build system, except for libnfc should work, gnunet, 2019/11/18
- [taler-taler-mdb] 13/93: reindent code to coding style, gnunet, 2019/11/18
- [taler-taler-mdb] 16/93: merged jsonIntegrity,
gnunet <=
- [taler-taler-mdb] 25/93: no curl here, gnunet, 2019/11/18
- [taler-taler-mdb] 21/93: product.h uncrustified, gnunet, 2019/11/18
- [taler-taler-mdb] 22/93: pseudo nonce, gnunet, 2019/11/18
- [taler-taler-mdb] 26/93: use check payment instead of poll payment, gnunet, 2019/11/18
- [taler-taler-mdb] 10/93: add bootstrap and uncrustify logic, gnunet, 2019/11/18
- [taler-taler-mdb] 17/93: merged jsonIntegrity, gnunet, 2019/11/18
- [taler-taler-mdb] 23/93: chaos monkey, gnunet, 2019/11/18
- [taler-taler-mdb] 15/93: fixes, gnunet, 2019/11/18
- [taler-taler-mdb] 14/93: updated .gitignore, gnunet, 2019/11/18
- [taler-taler-mdb] 20/93: more implementations using GNUNETUtils, gnunet, 2019/11/18