Skip to content

Commit

Permalink
Merge pull request #1097 from openziti/quiet.a.couple.warnings
Browse files Browse the repository at this point in the history
quiet warnings
  • Loading branch information
scareything authored Feb 10, 2025
2 parents 3805db4 + 6f4d807 commit b1d8329
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion programs/ziti-edge-tunnel/config-utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#ifdef MAX_PATH
#define PATH_MAX MAX_PATH
#else
#error "PATH_MAX and MAX_PATH are not defined, PATH_MAX cannot be set
#error "PATH_MAX and MAX_PATH are not defined, PATH_MAX cannot be set"
#endif
#endif
#define realpath(rel, abs) _fullpath(abs, rel, PATH_MAX)
Expand Down
2 changes: 1 addition & 1 deletion programs/ziti-edge-tunnel/include/instance-config.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

typedef char * (*to_json_fn)(const void * msg, int flags, size_t *len);

bool load_tunnel_status_from_file(uv_loop_t *ziti_loop, const char* config_file_name);
bool load_tunnel_status_from_file(const char *config_file_name);
bool save_tunnel_status_to_file();
void initialize_instance_config();
void cleanup_instance_config();
Expand Down
4 changes: 2 additions & 2 deletions programs/ziti-edge-tunnel/instance-config.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void initialize_instance_config() {
}
}

bool load_config_from_file(char* config_file_name) {
bool load_config_from_file(const char *config_file_name) {
bool loaded = false;

FILE* cfg_file = fopen(config_file_name, "r");
Expand Down Expand Up @@ -66,7 +66,7 @@ bool load_config_from_file(char* config_file_name) {
return loaded;
}

bool load_tunnel_status_from_file(uv_loop_t* ziti_loop, const char* config_file_name) {
bool load_tunnel_status_from_file(const char *config_file_name) {
bool loaded = false;

ZITI_LOG(INFO,"Loading config file from %s", config_file_name);
Expand Down
2 changes: 1 addition & 1 deletion programs/ziti-edge-tunnel/ziti-edge-tunnel.c
Original file line number Diff line number Diff line change
Expand Up @@ -1383,7 +1383,7 @@ static void run(int argc, char *argv[]) {
snprintf(config_file, PATH_MAX - 1, "%s%c%s", config_dir, PATH_SEP, "config.json");
normalize_identifier(config_file);

load_tunnel_status_from_file(global_loop_ref, config_file);
load_tunnel_status_from_file(config_file);
}

uint32_t tun_ip;
Expand Down

0 comments on commit b1d8329

Please sign in to comment.