experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Freebsd socketpair include problems and lack of TAB in vagrant Makefile

Browse source
This commit is contained in:
Olof hagsand 2022-12-27 11:56:21 +01:00
parent ca23b63a4e
commit 5b9921933a
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/src/clixon_client.c
View file

@ -42,6 +42,7 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <assert.h> #include <assert.h>
#include <sys/socket.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <netinet/in.h> #include <netinet/in.h>

2
lib/src/clixon_file.c
View file

@ -162,7 +162,7 @@ clicon_files_recursive(const char *dir,
/*! Return alphabetically sorted files from a directory matching regexp /*! Return alphabetically sorted files from a directory matching regexp
* *
* @param[in] dir Directory path * @param[in] dir Directory path
* @param[out] ent Entries pointer, will be filled in with dir entries. Free * @param[out] ent Entries pointer, will be filled in with dir entries. Free after use
* @param[in] regexp Regexp filename matching * @param[in] regexp Regexp filename matching
* @param[in] type File type matching, see stat(2) * @param[in] type File type matching, see stat(2)
* *

2
lib/src/clixon_proc.c
View file

@ -100,6 +100,7 @@
#endif #endif
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/user.h> #include <sys/user.h>
@ -152,7 +153,6 @@ struct process_entry_t {
proc_cb_t *pe_callback; /* Wrapper function, may be called from process_operation */ proc_cb_t *pe_callback; /* Wrapper function, may be called from process_operation */
}; };
/* Forward declaration */ /* Forward declaration */
static int clixon_process_sched_register(clicon_handle h, int delay); static int clixon_process_sched_register(clicon_handle h, int delay);

4
test/vagrant/Makefile.in
View file

@ -63,9 +63,9 @@ logs:
# appear eg as generic/centos8.log # appear eg as generic/centos8.log
$(VAGRANTS): logs $(VAGRANTS): logs
ifdef LOGDIR ifdef LOGDIR
with_restconf=$(RESTCONF) ./vagrant.sh $@ 2>&1 > "$(LOGDIR)/vagrant-$(RESTCONF)-$(subst /,-,$@).log" with_restconf=$(RESTCONF) ./vagrant.sh $@ 2>&1 > "$(LOGDIR)/vagrant-$(RESTCONF)-$(subst /,-,$@).log"
else else
with_restconf=$(RESTCONF) ./vagrant.sh $@ 2>&1 | tee "logs/vagrant-$(RESTCONF)-$(subst /,-,$@).log" with_restconf=$(RESTCONF) ./vagrant.sh $@ 2>&1 | tee "logs/vagrant-$(RESTCONF)-$(subst /,-,$@).log"
endif endif
destroy: destroy: