cleanup

netblue30 · Feb 25, 2021 · 17a95eb · 17a95eb
1 parent 04cdc12
commit 17a95eb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
@@ -931,7 +931,6 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
  return 0;
  }
  if (strncmp(ptr, "rmenv ", 6) == 0) {
- unsetenv(ptr + 6); // Remove also immediately from Firejail itself
  env_store(ptr + 6, RMENV);
  return 0;
  }

diff --git a/src/firejail/pulseaudio.c b/src/firejail/pulseaudio.c
@@ -80,8 +80,6 @@ static void pulseaudio_fallback(const char *path) {
 
  fmessage("Cannot mount tmpfs on %s/.config/pulse\n", cfg.homedir);
  env_store_name_val("PULSE_CLIENTCONFIG", path, SETENV);
- if (setenv("PULSE_CLIENTCONFIG", path, 1) < 0)
- errExit("setenv");
 }
 
 // disable shm in pulseaudio (issue #69)
@@ -176,8 +174,7 @@ void pulseaudio_init(void) {
  char *p;
  if (asprintf(&p, "%s/client.conf", homeusercfg) == -1)
  errExit("asprintf");
- if (setenv("PULSE_CLIENTCONFIG", p, 1) < 0)
- errExit("setenv");
+ env_store_name_val("PULSE_CLIENTCONFIG", p, SETENV);
  fs_logger2("create", p);
  free(p);