X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fsolaris.c;h=33f066df3adc03643063275e96e6ad13a324202e;hb=c9f1625908fff54fc1c2d717ab36787ce1e54c74;hp=76251b9291106a9dfaa4d343ea500a3198a1ae27;hpb=27b4c8550cfae4fd0f2169962e33f4907a8e7d71;p=monky

diff --git a/src/solaris.c b/src/solaris.c
index 76251b9..33f066d 100644
--- a/src/solaris.c
+++ b/src/solaris.c
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  * Conky, a system monitor, based on torsmo
  *
  * Any original torsmo code is licensed under the BSD license
@@ -7,7 +9,8 @@
  *
  * Please see COPYING for details
  *
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
+ *	(see AUTHORS)
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -20,13 +23,13 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *  $Id$
  */
 
 /* doesn't work, feel free to finish this */
 #include "conky.h"
+#include "common.h"
 #include <kstat.h>
 
 static kstat_ctl_t *kstat;
@@ -37,7 +40,7 @@ static void update_kstat()
 	if (kstat == NULL) {
 		kstat = kstat_open();
 		if (kstat == NULL) {
-			ERR("can't open kstat: %s", strerror(errno));
+			NORM_ERR("can't open kstat: %s", strerror(errno));
 		}
 	}
 
@@ -62,12 +65,10 @@ double get_uptime()
 	if (ksp != NULL) {
 		if (kstat_read(kstat, ksp, NULL) >= 0) {
 			kstat_named_t *knp;
-			knp =
-			    (kstat_named_t *) kstat_data_lookup(ksp,
-								"boot_time");
+
+			knp = (kstat_named_t *) kstat_data_lookup(ksp, "boot_time");
 			if (knp != NULL) {
-				return get_time() -
-				    (double) knp->value.ui32;
+				return get_time() - (double) knp->value.ui32;
 			}
 		}
 	}