chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
strv: fix STRV_FOREACH_PAIR macro definition
[elogind.git]
/
src
/
shared
/
util.c
diff --git
a/src/shared/util.c
b/src/shared/util.c
index c493a34877eb7b2408d573bd155f93a4d98e5bcb..dc2651f3f2004f0bf8dfe3aa4de56ccdc6ff029c 100644
(file)
--- a/
src/shared/util.c
+++ b/
src/shared/util.c
@@
-2963,7
+2963,7
@@
int status_welcome(void) {
if (r < 0 && r != -ENOENT)
log_warning("Failed to read /etc/os-release: %s", strerror(-r));
if (r < 0 && r != -ENOENT)
log_warning("Failed to read /etc/os-release: %s", strerror(-r));
- return status_printf(NULL, false,
+ return status_printf(NULL, false,
false,
"\nWelcome to \x1B[%sm%s\x1B[0m!\n",
isempty(ansi_color) ? "1" : ansi_color,
isempty(pretty_name) ? "Linux" : pretty_name);
"\nWelcome to \x1B[%sm%s\x1B[0m!\n",
isempty(ansi_color) ? "1" : ansi_color,
isempty(pretty_name) ? "Linux" : pretty_name);
@@
-5237,10
+5237,6
@@
int get_shell(char **_sh) {
return 0;
}
return 0;
}
-void freep(void *p) {
- free(*(void**) p);
-}
-
void fclosep(FILE **f) {
if (*f)
fclose(*f);
void fclosep(FILE **f) {
if (*f)
fclose(*f);
@@
-5261,10
+5257,6
@@
void closedirp(DIR **d) {
closedir(*d);
}
closedir(*d);
}
-void umaskp(mode_t *u) {
- umask(*u);
-}
-
bool filename_is_safe(const char *p) {
if (isempty(p))
bool filename_is_safe(const char *p) {
if (isempty(p))