X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fudev%2Flibudev-queue-private.c;h=ca6d229a2c91e50a450fe447ba230444e65fb61f;hp=71771950aab824951237ce3bb53dedb0d53f8457;hb=baa30fbc2c04b23209d0b8fb3c86cd15ef9ea81a;hpb=3e2147858f21943d5f4a781c60f33ac22c6096ed diff --git a/src/udev/libudev-queue-private.c b/src/udev/libudev-queue-private.c index 71771950a..ca6d229a2 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; @@ -208,15 +208,11 @@ static int rebuild_queue_file(struct udev_queue_export *udev_queue_export) /* read old queue file */ if (udev_queue_export->queue_file != NULL) { - dbg(udev_queue_export->udev, "compacting queue file, freeing %d bytes\n", - udev_queue_export->waste_bytes); - devpaths = build_index(udev_queue_export); if (devpaths != NULL) udev_queue_export->seqnum_max += devpaths->devpaths_first; } if (devpaths == NULL) { - dbg(udev_queue_export->udev, "creating empty queue file\n"); udev_queue_export->queued_count = 0; udev_queue_export->seqnum_max = udev_queue_export->seqnum_min; } @@ -292,10 +288,8 @@ static int write_queue_record(struct udev_queue_export *udev_queue_export, { unsigned short len; - if (udev_queue_export->queue_file == NULL) { - dbg(udev_queue_export->udev, "can't record event: queue file not available\n"); + if (udev_queue_export->queue_file == NULL) return -1; - } if (fwrite(&seqnum, sizeof(unsigned long long int), 1, udev_queue_export->queue_file) != 1) goto write_error;