diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2012-04-04 05:31:21 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2012-04-04 05:31:21 +0200 |
| commit | 4b0060e68bab7bddbe8968082af8e042b8c11316 (patch) | |
| tree | 48e347fef35f8f12c719436f4aa89f25cfc680ca /src/udev | |
| parent | Merge branch 'master' of ssh://git.freedesktop.org/git/systemd/systemd (diff) | |
| download | systemd-4b0060e68bab7bddbe8968082af8e042b8c11316.tar.xz systemd-4b0060e68bab7bddbe8968082af8e042b8c11316.zip | |
udev: fix gcc warnings
Diffstat (limited to 'src/udev')
| -rw-r--r-- | src/udev/libudev-queue-private.c | 2 | ||||
| -rw-r--r-- | src/udev/scsi_id/scsi_id.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/udev/libudev-queue-private.c b/src/udev/libudev-queue-private.c index 71771950aa..d3e09e8b27 100644 --- a/src/udev/libudev-queue-private.c +++ b/src/udev/libudev-queue-private.c @@ -119,7 +119,7 @@ static int skip_to(FILE *file, long offset) old_offset = ftell(file); if (offset > old_offset && offset - old_offset <= BUFSIZ) { size_t skip_bytes = offset - old_offset; - char buf[skip_bytes]; + char *buf = alloca(skip_bytes); if (fread(buf, skip_bytes, 1, file) != skip_bytes) return -1; diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c index 9bb0d7f538..206cbfd095 100644 --- a/src/udev/scsi_id/scsi_id.c +++ b/src/udev/scsi_id/scsi_id.c @@ -78,7 +78,7 @@ static void set_type(const char *from, char *to, size_t len) { int type_num; char *eptr; - char *type = "generic"; + const char *type = "generic"; type_num = strtoul(from, &eptr, 0); if (eptr != from) { @@ -122,10 +122,10 @@ static void set_type(const char *from, char *to, size_t len) */ static char *get_value(char **buffer) { - static char *quote_string = "\"\n"; - static char *comma_string = ",\n"; + static const char *quote_string = "\"\n"; + static const char *comma_string = ",\n"; char *val; - char *end; + const char *end; if (**buffer == '"') { /* |