X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibudev%2Flibudev-queue-private.c;h=367395d9849062d2ede9ed248836a2d57f69aee4;hb=cba6e0627d659a33df31aaa74d0d701c4bc9f317;hp=f653e6db4c8468fd48155801e87c4d006af66feb;hpb=6ada823a9a0979ea145fd70add1007c21caa45c0;p=elogind.git diff --git a/src/libudev/libudev-queue-private.c b/src/libudev/libudev-queue-private.c index f653e6db4..367395d98 100644 --- a/src/libudev/libudev-queue-private.c +++ b/src/libudev/libudev-queue-private.c @@ -151,7 +151,7 @@ static struct queue_devpaths *build_index(struct udev_queue_export *udev_queue_e /* allocate the table */ range = udev_queue_export->seqnum_min - udev_queue_export->seqnum_max; if (range - 1 > INT_MAX) { - err(udev_queue_export->udev, "queue file overflow\n"); + udev_err(udev_queue_export->udev, "queue file overflow\n"); return NULL; } devpaths = calloc(1, sizeof(struct queue_devpaths) + (range + 1) * sizeof(long)); @@ -188,7 +188,7 @@ static struct queue_devpaths *build_index(struct udev_queue_export *udev_queue_e return devpaths; read_error: - err(udev_queue_export->udev, "queue file corrupted\n"); + udev_err(udev_queue_export->udev, "queue file corrupted\n"); free(devpaths); return NULL; } @@ -212,7 +212,7 @@ static int rebuild_queue_file(struct udev_queue_export *udev_queue_export) } /* create new queue file */ - new_queue_file = fopen("/run/udev/queue.tmp", "w+"); + new_queue_file = fopen("/run/udev/queue.tmp", "w+e"); if (new_queue_file == NULL) goto error; seqnum = udev_queue_export->seqnum_max; @@ -256,7 +256,7 @@ static int rebuild_queue_file(struct udev_queue_export *udev_queue_export) return 0; error: - err(udev_queue_export->udev, "failed to create queue file: %m\n"); + udev_err(udev_queue_export->udev, "failed to create queue file: %m\n"); udev_queue_export_cleanup(udev_queue_export); if (udev_queue_export->queue_file != NULL) { @@ -303,7 +303,7 @@ static int write_queue_record(struct udev_queue_export *udev_queue_export, write_error: /* if we failed half way through writing a record to a file, we should not try to write any further records to it. */ - err(udev_queue_export->udev, "error writing to queue file: %m\n"); + udev_err(udev_queue_export->udev, "error writing to queue file: %m\n"); fclose(udev_queue_export->queue_file); udev_queue_export->queue_file = NULL;