X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=snmp%2Flustre-snmp-util.c;h=36845add55f7fba61ddc1b8218f498577b7ff3e2;hp=9969272244c39ccfa7c4979a9eedce6fd1a87287;hb=20dfdeda5ea3f679b68c4a9fb6924c90a0a79cac;hpb=0ebabeac2cbb3d33e17ba8a405e0373c3636a7c6

diff --git a/snmp/lustre-snmp-util.c b/snmp/lustre-snmp-util.c
index 9969272..36845ad 100644
--- a/snmp/lustre-snmp-util.c
+++ b/snmp/lustre-snmp-util.c
@@ -1,23 +1,39 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
+/*
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
  *
- *  Copyright (c) 2005 Cluster File Systems, Inc.
- *   Author: PJ Kirner <pjkirner@clusterfs.com>
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
  *
- *   This file is part of Lustre, http://www.lustre.org.
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
  *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
  *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * snmp/lustre-snmp-util.c
  *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Author: PJ Kirner <pjkirner@clusterfs.com>
  */
 
 /*
@@ -33,7 +49,9 @@
  */ 
 
 #include <sys/types.h>
+#if defined (__linux__)
 #include <sys/vfs.h>
+#endif
 #include <dirent.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -276,8 +294,6 @@ void lustrefs_ctrl(int command)
 
 int get_sysstatus(void)
 {
-    FILE    *fptr = NULL;
-    int     len = 0;
     int     ret_val = ERROR ;
     char    sys_status[50] = {0};
     
@@ -342,9 +358,9 @@ int read_counter64(const char *file_path, counter64 *c64,int factor)
 
     if ((ret_val = read_string(file_path, file_data,sizeof(file_data))) == SUCCESS) {
         tmp = atoll(file_data) * factor;
-        c64->low = (ulong) (0x0FFFFFFFF & tmp);
+        c64->low = (unsigned long) (0x0FFFFFFFF & tmp);
         tmp >>= 32; /* Shift right by 4 bytes */
-        c64->high = (ulong) (0x0FFFFFFFF & tmp);
+        c64->high = (unsigned long) (0x0FFFFFFFF & tmp);
     }
     return ret_val;
 }
@@ -522,9 +538,9 @@ unsigned char*
         size_t  *var_len)
 {
     static unsigned char string[SPRINT_MAX_LEN];
-    if( SUCCESS != read_string(file_path, string,sizeof(string)))
+    if( SUCCESS != read_string(file_path, (char *)string,sizeof(string)))
         return NULL;
-    *var_len = strlen(string);
+    *var_len = strlen((char *)string);
     return (unsigned char *) string;
 }