Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

shm node: fix compiler / build-system errors

Browse source
This commit is contained in:
Steffen Vogel 2017-04-15 21:24:00 +02:00
parent 6b09a214c2
commit 2d71d606ce
6 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/villas/advio.h
View file

@ -10,7 +10,7 @@
#include <curl/curl.h>
#include "utils.h"
#include "crypt.h"
struct advio {
CURL *curl;

1
include/villas/crypt.h
View file

@ -7,6 +7,7 @@
#pragma once
#include <stdio.h>
#include <openssl/sha.h>
/** Calculate SHA1 hash of complete file \p f and place it into \p sha1.
*

4
include/villas/json.h
View file

@ -1,11 +1,10 @@
#pragma once
/** JSON serializtion of various objects.
*
* @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
* @copyright 2017, Institute for Automation of Complex Power Systems, EONERC
*********************************************************************************/
#ifdef WITH_JANSSON
#pragma once
#include <jansson.h>
#include <libconfig.h>
@ -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

3
lib/crypt.c
View file

@ -1,11 +1,10 @@
#include "crypt.h"
/** Crypto helpers.
*
* @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
* @copyright 2017, Institute for Automation of Complex Power Systems, EONERC
*********************************************************************************/
#include <openssl/sha.h>
#include "crypt.h"
int sha1sum(FILE *f, unsigned char *sha1)
{

3
lib/json.c
View file

@ -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

3
src/shmem.c
View file

@ -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;