diff --git a/include/villas/advio.h b/include/villas/advio.h index c4ca19a25..b7c018582 100644 --- a/include/villas/advio.h +++ b/include/villas/advio.h @@ -10,7 +10,7 @@ #include -#include "utils.h" +#include "crypt.h" struct advio { CURL *curl; diff --git a/include/villas/crypt.h b/include/villas/crypt.h index e1ef47b7c..fb1687482 100644 --- a/include/villas/crypt.h +++ b/include/villas/crypt.h @@ -7,6 +7,7 @@ #pragma once #include +#include /** Calculate SHA1 hash of complete file \p f and place it into \p sha1. * diff --git a/include/villas/json.h b/include/villas/json.h index 9f0fb3b9f..8e3cbf7fe 100644 --- a/include/villas/json.h +++ b/include/villas/json.h @@ -1,11 +1,10 @@ -#pragma once /** JSON serializtion of various objects. * * @author Steffen Vogel * @copyright 2017, Institute for Automation of Complex Power Systems, EONERC *********************************************************************************/ -#ifdef WITH_JANSSON +#pragma once #include #include @@ -24,4 +23,3 @@ int sample_io_json_unpack(json_t *j, struct sample *s, int *flags); int sample_io_json_fprint(FILE *f, struct sample *s, int flags); int sample_io_json_fscan(FILE *f, struct sample *s, int *flags); -#endif diff --git a/lib/crypt.c b/lib/crypt.c index 2831e945e..2ab0bfef9 100644 --- a/lib/crypt.c +++ b/lib/crypt.c @@ -1,11 +1,10 @@ -#include "crypt.h" /** Crypto helpers. * * @author Steffen Vogel * @copyright 2017, Institute for Automation of Complex Power Systems, EONERC *********************************************************************************/ -#include +#include "crypt.h" int sha1sum(FILE *f, unsigned char *sha1) { diff --git a/lib/json.c b/lib/json.c index 75cb5f4fe..fc2e1eda2 100644 --- a/lib/json.c +++ b/lib/json.c @@ -6,7 +6,6 @@ #include "json.h" -#ifdef WITH_JANSSON static int json_to_config_type(int type) { switch (type) { @@ -222,5 +221,3 @@ int sample_io_json_fscan(FILE *f, struct sample *s, int *flags) return ret; } -#endif - diff --git a/src/shmem.c b/src/shmem.c index 57411132e..ebaeada79 100644 --- a/src/shmem.c +++ b/src/shmem.c @@ -70,9 +70,6 @@ int main(int argc, char* argv[]) if (avail < readcnt) warn("Pool underrun: %d / %d\n", avail, readcnt); - for (int i = 0; i < readcnt; i++) - sample_io_villas_fprint(stdout, insmps[i], SAMPLE_IO_ALL); - for (int i = 0; i < avail; i++) { outsmps[i]->sequence = insmps[i]->sequence; outsmps[i]->ts = insmps[i]->ts;