Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-4660 osd-ldiskfs: fix osd_bufs_get() error handling
[fs/lustre-release.git]
/
snmp
/
lustre-snmp-trap.c
diff --git
a/snmp/lustre-snmp-trap.c
b/snmp/lustre-snmp-trap.c
index
9b6073d
..
2c1a20d
100644
(file)
--- a/
snmp/lustre-snmp-trap.c
+++ b/
snmp/lustre-snmp-trap.c
@@
-1,6
+1,4
@@
-/* -*- 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.
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@
-26,7
+24,7
@@
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
- * Copyright
2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright
(c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
* Use is subject to license terms.
*/
/*
@@
-51,14
+49,13
@@
*/
#include <sys/types.h>
*/
#include <sys/types.h>
-#if defined (__linux__)
#include <sys/vfs.h>
#include <sys/vfs.h>
-#endif
#include <dirent.h>
#include <sys/stat.h>
#include <unistd.h>
#include <stdio.h>
#include <stdarg.h>
#include <dirent.h>
#include <sys/stat.h>
#include <unistd.h>
#include <stdio.h>
#include <stdarg.h>
+#include <ctype.h>
#include "lustre-snmp-util.h"
/**************************************************************************
#include "lustre-snmp-util.h"
/**************************************************************************
@@
-364,7
+361,7
@@
void send_portals_catastrophe_trap(char *reason_string)
/*And the data is a octet string, that contains the actually reason string*/
var_trap[1].type = ASN_OCTET_STR;
/*And the data is a octet string, that contains the actually reason string*/
var_trap[1].type = ASN_OCTET_STR;
- var_trap[1].val.string = reason_string;
+ var_trap[1].val.string =
(unsigned char *)
reason_string;
var_trap[1].val_len = strlen(reason_string);
/*And now send off the trap*/
var_trap[1].val_len = strlen(reason_string);
/*And now send off the trap*/
@@
-419,7
+416,7
@@
void send_obd_unhealthy_trap(char *obd_name,char *reason_string)
/*And the data is a octet string, that contains the actually reason strong*/
var_trap[1].type = ASN_OCTET_STR;
/*And the data is a octet string, that contains the actually reason strong*/
var_trap[1].type = ASN_OCTET_STR;
- var_trap[1].val.string = obd_name;
+ var_trap[1].val.string =
(unsigned char *)
obd_name;
var_trap[1].val_len = strlen(obd_name);
/*
var_trap[1].val_len = strlen(obd_name);
/*
@@
-434,7
+431,7
@@
void send_obd_unhealthy_trap(char *obd_name,char *reason_string)
/*And the data is a octet string, that contains the actually reason strong*/
var_trap[2].type = ASN_OCTET_STR;
/*And the data is a octet string, that contains the actually reason strong*/
var_trap[2].type = ASN_OCTET_STR;
- var_trap[2].val.string = reason_string;
+ var_trap[2].val.string =
(unsigned char *)
reason_string;
var_trap[2].val_len = strlen(reason_string);
/*And now send off the trap*/
var_trap[2].val_len = strlen(reason_string);
/*And now send off the trap*/