chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] remove historical SYSFS_attr="value" format
[elogind.git]
/
udevinfo.c
diff --git
a/udevinfo.c
b/udevinfo.c
index 290a09e880aee1dc7c95c03417fab4ee39e4eea6..08c25d3a047883029f25821759b166cca100ff73 100644
(file)
--- a/
udevinfo.c
+++ b/
udevinfo.c
@@
-32,14
+32,11
@@
#include "udev.h"
#include "udev_lib.h"
#include "udev_version.h"
#include "udev.h"
#include "udev_lib.h"
#include "udev_version.h"
+#include "udev_db.h"
#include "logging.h"
#include "logging.h"
-#include "udevdb.h"
-# define SYSFS_VALUE_MAX 200
-
-char **main_argv;
-int main_argc;
+#define SYSFS_VALUE_SIZE 256
#ifdef LOG
unsigned char logname[LOGNAME_SIZE];
#ifdef LOG
unsigned char logname[LOGNAME_SIZE];
@@
-58,7
+55,7
@@
static int print_all_attributes(const char *path)
struct dlist *attributes;
struct sysfs_attribute *attr;
struct sysfs_directory *sysfs_dir;
struct dlist *attributes;
struct sysfs_attribute *attr;
struct sysfs_directory *sysfs_dir;
- char value[SYSFS_VALUE_
MAX
];
+ char value[SYSFS_VALUE_
SIZE
];
int len;
int retval = 0;
int len;
int retval = 0;
@@
-257,7
+254,7
@@
static int print_sysfs_devices(void)
return 0;
}
return 0;
}
-static int process_options(
void
)
+static int process_options(
int argc, char *argv[]
)
{
static const char short_options[] = "adn:p:q:rsVh";
int option;
{
static const char short_options[] = "adn:p:q:rsVh";
int option;
@@
-274,7
+271,7
@@
static int process_options(void)
/* get command line options */
while (1) {
/* get command line options */
while (1) {
- option = getopt(
main_argc, main_
argv, short_options);
+ option = getopt(
argc,
argv, short_options);
if (option == -1)
break;
if (option == -1)
break;
@@
-358,7
+355,7
@@
static int process_options(void)
}
memset(&udev, 0x00, sizeof(struct udevice));
strfieldcpy(udev.devpath, pos);
}
memset(&udev, 0x00, sizeof(struct udevice));
strfieldcpy(udev.devpath, pos);
- retval = udev
db_get_dev
(&udev);
+ retval = udev
_db_get_device
(&udev);
if (retval != 0) {
printf("device not found in database\n");
goto exit;
if (retval != 0) {
printf("device not found in database\n");
goto exit;
@@
-377,7
+374,7
@@
static int process_options(void)
memset(&udev, 0x00, sizeof(struct udevice));
strfieldcpy(udev.name, pos);
memset(&udev, 0x00, sizeof(struct udevice));
strfieldcpy(udev.name, pos);
- retval = udev
db_get_dev
_byname(&udev, pos);
+ retval = udev
_db_get_device
_byname(&udev, pos);
if (retval != 0) {
printf("device not found in database\n");
goto exit;
if (retval != 0) {
printf("device not found in database\n");
goto exit;
@@
-479,15
+476,12
@@
int main(int argc, char *argv[], char *envp[])
{
int rc = 0;
{
int rc = 0;
- main_argv = argv;
- main_argc = argc;
-
logging_init("udevinfo");
/* initialize our configuration */
udev_init_config();
logging_init("udevinfo");
/* initialize our configuration */
udev_init_config();
- rc = process_options();
+ rc = process_options(
argc, argv
);
logging_close();
exit(rc);
logging_close();
exit(rc);