From 339f34e3a0f15a406fa447d7cf3872843ef6aeac Mon Sep 17 00:00:00 2001
From: Ed Schouten <ed@FreeBSD.org>
Date: Fri, 25 Feb 2011 23:05:35 +0000
Subject: [PATCH] Fix style(9) issues in pututxline(3).

Also, make sure to initialize the `ret' variable properly.

Reported by:	Cedric Jonas <cedric c84 eu>
Patch by:	Garrett Cooper <yanegomi gmail com>
---
 lib/libc/gen/pututxline.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/libc/gen/pututxline.c b/lib/libc/gen/pututxline.c
index 731817fae4d..4caa00c9d16 100644
--- a/lib/libc/gen/pututxline.c
+++ b/lib/libc/gen/pututxline.c
@@ -43,8 +43,8 @@ __FBSDID("$FreeBSD$");
 static FILE *
 futx_open(const char *file)
 {
-	struct stat sb;
 	FILE *fp;
+	struct stat sb;
 	int fd;
 
 	fd = _open(file, O_CREAT|O_RDWR|O_EXLOCK, 0644);
@@ -69,11 +69,14 @@ futx_open(const char *file)
 static int
 utx_active_add(const struct futx *fu)
 {
-	struct futx fe;
 	FILE *fp;
-	off_t partial = -1;
+	struct futx fe;
+	off_t partial;
 	int error, ret;
 
+	partial = -1;
+	ret = 0;
+
 	/*
 	 * Register user login sessions.  Overwrite entries of sessions
 	 * that have already been terminated.
@@ -132,8 +135,8 @@ exact:
 static int
 utx_active_remove(struct futx *fu)
 {
-	struct futx fe;
 	FILE *fp;
+	struct futx fe;
 	int error, ret;
 
 	/*
@@ -266,7 +269,9 @@ struct utmpx *
 pututxline(const struct utmpx *utmpx)
 {
 	struct futx fu;
-	int bad = 0;
+	int bad;
+
+	bad = 0;
 
 	utx_to_futx(utmpx, &fu);