chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2e31718
)
[PATCH] remove some more KLIBC fixups that are no longer needed.
author
greg@kroah.com
<greg@kroah.com>
Thu, 12 Feb 2004 09:14:48 +0000
(
01:14
-0800)
committer
Greg KH
<gregkh@suse.de>
Wed, 27 Apr 2005 04:32:26 +0000
(21:32 -0700)
klibc_fixups.h
patch
|
blob
|
history
udev-add.c
patch
|
blob
|
history
diff --git
a/klibc_fixups.h
b/klibc_fixups.h
index 37622c86d621d9c3a888ad4b56c2cd9ed4a69d68..1ac112b08796a7144bee3bd848f02cb21b56d744 100644
(file)
--- a/
klibc_fixups.h
+++ b/
klibc_fixups.h
@@
-3,12
+3,6
@@
#ifndef KLIBC_FIXUPS_H
#define KLIBC_FIXUPS_H
#ifndef KLIBC_FIXUPS_H
#define KLIBC_FIXUPS_H
-
-#define WTERMSIG(status) ((status) & 0x7f)
-#define WEXITSTATUS(status) (((status) & 0xff00) >> 8)
-#define WIFEXITED(status) (WTERMSIG(status) == 0)
-
-
struct group {
char *gr_name; /* group name */
char *gr_passwd; /* group password */
struct group {
char *gr_name; /* group name */
char *gr_passwd; /* group password */
diff --git
a/udev-add.c
b/udev-add.c
index 9f07d22ec6c95828b015d15b0a968cd8dffb3fa9..fedc8f0fc80666d10fe4d6f36a75ba9507f9eac6 100644
(file)
--- a/
udev-add.c
+++ b/
udev-add.c
@@
-109,19
+109,12
@@
static int create_node(struct udevice *dev)
int retval = 0;
uid_t uid = 0;
gid_t gid = 0;
int retval = 0;
uid_t uid = 0;
gid_t gid = 0;
- dev_t res;
int i;
int tail;
strncpy(filename, udev_root, sizeof(filename));
strncat(filename, dev->name, sizeof(filename));
int i;
int tail;
strncpy(filename, udev_root, sizeof(filename));
strncat(filename, dev->name, sizeof(filename));
-#ifdef __KLIBC__
- res = (dev->major << 8) | (dev->minor);
-#else
- res = makedev(dev->major, dev->minor);
-#endif
-
switch (dev->type) {
case 'b':
dev->mode |= S_IFBLK;
switch (dev->type) {
case 'b':
dev->mode |= S_IFBLK;
@@
-144,7
+137,7
@@
static int create_node(struct udevice *dev)
info("creating device node '%s'", filename);
dbg("mknod(%s, %#o, %u, %u)", filename, dev->mode, dev->major, dev->minor);
info("creating device node '%s'", filename);
dbg("mknod(%s, %#o, %u, %u)", filename, dev->mode, dev->major, dev->minor);
- retval = mknod(filename, dev->mode,
res
);
+ retval = mknod(filename, dev->mode,
makedev(dev->major, dev->minor)
);
if (retval != 0)
dbg("mknod(%s, %#o, %u, %u) failed with error '%s'",
filename, dev->mode, dev->major, dev->minor, strerror(errno));
if (retval != 0)
dbg("mknod(%s, %#o, %u, %u) failed with error '%s'",
filename, dev->mode, dev->major, dev->minor, strerror(errno));