chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
efivars: itialize variable
[elogind.git]
/
src
/
shared
/
util.c
diff --git
a/src/shared/util.c
b/src/shared/util.c
index dc6528013bb0a7fded44e17a9e84e3eb5473b9f8..74f29949c97619ce429b49e5b6f8d49f43fb297a 100644
(file)
--- a/
src/shared/util.c
+++ b/
src/shared/util.c
@@
-19,7
+19,6
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <assert.h>
#include <string.h>
#include <unistd.h>
#include <errno.h>
#include <string.h>
#include <unistd.h>
#include <errno.h>
@@
-48,7
+47,6
@@
#include <pwd.h>
#include <netinet/ip.h>
#include <linux/kd.h>
#include <pwd.h>
#include <netinet/ip.h>
#include <linux/kd.h>
-#include <dlfcn.h>
#include <sys/wait.h>
#include <sys/time.h>
#include <glob.h>
#include <sys/wait.h>
#include <sys/time.h>
#include <glob.h>
@@
-83,7
+81,6
@@
#include "missing.h"
#include "log.h"
#include "strv.h"
#include "missing.h"
#include "log.h"
#include "strv.h"
-#include "label.h"
#include "mkdir.h"
#include "path-util.h"
#include "exit-status.h"
#include "mkdir.h"
#include "path-util.h"
#include "exit-status.h"
@@
-1692,6
+1689,7
@@
bool chars_intersect(const char *a, const char *b) {
bool fstype_is_network(const char *fstype) {
static const char table[] =
bool fstype_is_network(const char *fstype) {
static const char table[] =
+ "afs\0"
"cifs\0"
"smbfs\0"
"sshfs\0"
"cifs\0"
"smbfs\0"
"sshfs\0"
@@
-6001,7
+5999,7
@@
int on_ac_power(void) {
d = opendir("/sys/class/power_supply");
if (!d)
d = opendir("/sys/class/power_supply");
if (!d)
- return -errno;
+ return
errno == ENOENT ? true :
-errno;
for (;;) {
struct dirent *de;
for (;;) {
struct dirent *de;