mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-03 18:57:06 +01:00
Code Issues Projects Releases Wiki Activity

devtools/create-gossipstore: clean up enough to pass check-source.

Browse source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2019-04-08 09:26:30 +09:30
parent 6dd1dacb9c
commit fbb494fba3
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
devtools/create-gossipstore.c
View file

@ -9,8 +9,6 @@
#include <gossipd/gen_gossip_store.h> #include <gossipd/gen_gossip_store.h>
#include <gossipd/gossip_store.h> #include <gossipd/gossip_store.h>
#include <inttypes.h> #include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
@ -26,7 +24,7 @@ struct scidsat * load_scid_file(FILE * scidfd)
fscanf(scidfd, "%s\n", title); fscanf(scidfd, "%s\n", title);
struct scidsat * scids = calloc(n, sizeof(scidsat)); struct scidsat * scids = calloc(n, sizeof(scidsat));
int i = 0; int i = 0;
while(fscanf(scidfd, "%s ,%ld\n", scids[i].scid, &scids[i].sat.satoshis) == 2 ) { while(fscanf(scidfd, "%s ,%ld\n", scids[i].scid, &scids[i].sat.satoshis) == 2 ) { /* Raw: read from file */
i++; i++;
} }
return scids; return scids;
@ -41,7 +39,7 @@ int main(int argc, char *argv[])
char *infile = NULL, *outfile = NULL, *scidfile = NULL, *csat = NULL; char *infile = NULL, *outfile = NULL, *scidfile = NULL, *csat = NULL;
int infd, outfd; int infd, outfd;
FILE * scidfd; FILE * scidfd;
struct scidsat * scids; struct scidsat * scids = NULL;
unsigned max = -1U; unsigned max = -1U;
setup_locale(); setup_locale();
@ -113,7 +111,7 @@ int main(int argc, char *argv[])
switch (fromwire_peektype(inmsg)) { switch (fromwire_peektype(inmsg)) {
case WIRE_CHANNEL_ANNOUNCEMENT: case WIRE_CHANNEL_ANNOUNCEMENT:
if (scidfile) { if (scids) {
sat = scids[scidi].sat; sat = scids[scidi].sat;
scidi += 1; scidi += 1;
} }
@ -151,7 +149,6 @@ int main(int argc, char *argv[])
break; break;
} }
fprintf(stderr, "channels %d, updates %d, nodes %d\n", channels, updates, nodes); fprintf(stderr, "channels %d, updates %d, nodes %d\n", channels, updates, nodes);
if (scidfile)
free(scids); free(scids);
return 0; return 0;
} }

4
devtools/create-gossipstore.h
View file

@ -1,3 +1,5 @@
#ifndef LIGHTNING_DEVTOOLS_CREATE_GOSSIPSTORE_H
#define LIGHTNING_DEVTOOLS_CREATE_GOSSIPSTORE_H
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <common/amount.h> #include <common/amount.h>
@ -8,4 +10,4 @@ struct scidsat {
} scidsat; } scidsat;
struct scidsat * load_scid_file(FILE * scidfd); struct scidsat * load_scid_file(FILE * scidfd);
#endif /* LIGHTNING_DEVTOOLS_CREATE_GOSSIPSTORE_H */

2
tools/check-includes.sh
View file

@ -9,7 +9,7 @@ HEADER_ID_SUFFIX="_H"
REGEXP_EXCLUDE_FILES_WITH_PREFIX="ccan/" REGEXP_EXCLUDE_FILES_WITH_PREFIX="ccan/"
for HEADER_FILE in $(git ls-files -- "*.h" | grep -vE "^${REGEXP_EXCLUDE_FILES_WITH_PREFIX}") for HEADER_FILE in $(git ls-files -- "*.h" | grep -vE "^${REGEXP_EXCLUDE_FILES_WITH_PREFIX}")
do do
HEADER_ID_BASE=$(tr / _ <<< "${HEADER_FILE/%.h/}" | tr "[:lower:]" "[:upper:]") HEADER_ID_BASE=$(tr /- _ <<< "${HEADER_FILE/%.h/}" | tr "[:lower:]" "[:upper:]")
HEADER_ID="${HEADER_ID_PREFIX}${HEADER_ID_BASE}${HEADER_ID_SUFFIX}" HEADER_ID="${HEADER_ID_PREFIX}${HEADER_ID_BASE}${HEADER_ID_SUFFIX}"
if [[ $(grep -cE "^#((ifndef|define) ${HEADER_ID}|endif /\\* ${HEADER_ID} \\*/)$" "${HEADER_FILE}") != 3 ]]; then if [[ $(grep -cE "^#((ifndef|define) ${HEADER_ID}|endif /\\* ${HEADER_ID} \\*/)$" "${HEADER_FILE}") != 3 ]]; then
echo "${HEADER_FILE} seems to be missing the expected include guard:" echo "${HEADER_FILE} seems to be missing the expected include guard:"