X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fscript.c;h=d443ede71a229e41ca0da7c0623186bdfa0ae01e;hp=389dc3708b05c1bb97d1597dfa4c67ef4502a937;hb=0300fe7589a1701361735ac068e4b57bb1a1896f;hpb=74b94c1442ec0897c1f90a314838594a5d42bb87 diff --git a/src/script.c b/src/script.c index 389dc37..d443ede 100644 --- a/src/script.c +++ b/src/script.c @@ -209,7 +209,7 @@ static void entry_to_env(const char *name, const void *data, size_t len, enum en putenv(buf); } -#ifdef EXT_S46 + static void s46_to_env_portparams(const uint8_t *data, size_t len, FILE *fp) { uint8_t *odata; @@ -223,7 +223,7 @@ static void s46_to_env_portparams(const uint8_t *data, size_t len, FILE *fp) } } } -#endif + static void s46_to_env(enum odhcp6c_state state, const uint8_t *data, size_t len) { @@ -237,7 +237,6 @@ static void s46_to_env(enum odhcp6c_state state, const uint8_t *data, size_t len fputs(name, fp); fputc('=', fp); -#ifdef EXT_S46 const char *type = (state == STATE_S46_MAPE) ? "map-e" : (state == STATE_S46_MAPT) ? "map-t" : "lw4o6"; @@ -327,9 +326,6 @@ static void s46_to_env(enum odhcp6c_state state, const uint8_t *data, size_t len fputc(' ', fp); } -#else - if (data && len) {} -#endif fclose(fp); putenv(str);