@@ -51,19 +51,6 @@ optProc(int argc, char* const* argv, int opt)
51
51
return ;
52
52
}
53
53
54
- char *
55
- readable_fs (long unsigned bytes , char * buf )
56
- {
57
- int i = 0 ;
58
- const char * units [] = { "B" , "kB" , "MB" , "GB" , "TB" , "PB" , "EB" , "ZB" , "YB" };
59
- while (bytes > 1024 ) {
60
- bytes /= 1024 ;
61
- i ++ ;
62
- }
63
- sprintf (buf , "%lu%s" , bytes , units [i ]);
64
- return buf ;
65
- }
66
-
67
54
struct hrentry_t *
68
55
attachentry (struct hrentry_t * hentry )
69
56
{
@@ -97,8 +84,8 @@ filterentry(struct hrentry_t* hentry)
97
84
status = 1 ;
98
85
} else if (netsnmp_oid_equals (hrfstype_iso_oid , index_len , hentry -> hrfstype , hentry -> hrfstype_len ) == 0 ) {
99
86
status = 1 ;
100
- }
101
-
87
+ }
88
+
102
89
else if (netsnmp_oid_equals (hrfstype_other_oid , index_len , hentry -> hrfstype , hentry -> hrfstype_len ) == 0 ) {
103
90
status = 1 ;
104
91
}
@@ -149,7 +136,6 @@ querryentries(netsnmp_session* pss, struct hrentry_t* hentry)
149
136
if (netsnmp_oid_equals (hrsttype_oid , index_len , vp -> name , vp -> name_length ) == 0 ) {
150
137
memcpy (hentry -> hrsttype , vp -> val .objid , vp -> val_len );
151
138
hentry -> hrsttype_len = (vp -> val_len / sizeof (oid ));
152
-
153
139
}
154
140
if (netsnmp_oid_equals (hrstdesc_oid , index_len , vp -> name , vp -> name_length ) == 0 ) {
155
141
memcpy (hentry -> hrstdesc , vp -> val .string , vp -> val_len );
@@ -233,16 +219,15 @@ main(int argc, char** argv)
233
219
}
234
220
235
221
/* Retrieve indexes */
236
- for (hrfsst_var = hrfsstindex_var ; hrfsst_var ; hrfsst_var = hrfsst_var -> next_variable ) {
237
-
222
+ for (hrfsst_var = hrfsstindex_var ; hrfsst_var ; hrfsst_var = hrfsst_var -> next_variable ) {
223
+
238
224
if (* hrfsst_var -> val .integer != 0 ) {
239
225
hentry = attachentry (hentry );
240
226
hentry -> hrstind = * hrfsst_var -> val .integer ;
241
227
hentry -> hrfsind = hrfsst_var -> name [hrfsst_var -> name_length - 1 ];
242
228
}
243
229
}
244
230
245
-
246
231
snmp_free_var (hrfsstindex_var );
247
232
248
233
/* Query Entries */
@@ -272,7 +257,6 @@ main(int argc, char** argv)
272
257
273
258
readable_fs (hused [i ], & bhused [i ][0 ]);
274
259
strcpy (& hrstdesc [i ][0 ], hfree -> hrstdesc );
275
-
276
260
}
277
261
278
262
for (hfree = hentry ; hfree ; hfree = hfree -> prev ) {
@@ -289,7 +273,6 @@ main(int argc, char** argv)
289
273
}
290
274
}
291
275
292
-
293
276
char * wexit_msg = "DISK WARNING -" ;
294
277
char * cexit_msg = "DISK CRITICAL -" ;
295
278
char * oexit_msg = "DISK OK -" ;
0 commit comments