ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/libstatgrab/src/libstatgrab/tools.c
(Generate patch)

Comparing projects/libstatgrab/src/libstatgrab/tools.c (file contents):
Revision 1.58 by ats, Mon Nov 1 20:34:58 2004 UTC vs.
Revision 1.62 by ats, Sun Nov 7 12:34:24 2004 UTC

# Line 42 | Line 42
42   #include <sys/param.h>
43   #include <sys/sysctl.h>
44   #endif
45 + #ifdef HPUX
46 + #include <sys/param.h>
47 + #include <sys/pstat.h>
48 + #endif
49  
50   #include "tools.h"
51   #include "statgrab.h"
# Line 230 | Line 234 | static int build_mapping(){
234                          if(strcmp(ksp->ks_module, "md")==0) continue;
235                          if((kstat_read(kc, ksp, &kios))==-1) continue;
236                          strncpy(device_name, ksp->ks_name, sizeof device_name);
237 <                        for(x=0;x<(sizeof device_name);x++){
237 >                        for(x=0;x<(int)(sizeof device_name);x++){
238                                  if( isdigit((int)device_name[x]) ) break;
239                          }
240                          if(x == sizeof device_name) x--;
# Line 290 | Line 294 | char *sg_get_string_match(char *line, regmatch_t *matc
294          return match_string;
295   }
296  
297 < long long sg_get_ll_match(char *line, regmatch_t *match){
294 <        char *ptr;
295 <        long long num;
296 <
297 <        ptr=line+match->rm_so;
298 <        num=atoll(ptr);
299 <
300 <        return num;
301 < }
302 < #endif
303 <
297 > /* Cygwin (without a recent newlib) doesn't have atoll */
298   #ifndef HAVE_ATOLL
299   static long long atoll(const char *s) {
300          long long value = 0;
# Line 321 | Line 315 | static long long atoll(const char *s) {
315   }
316   #endif
317  
318 + long long sg_get_ll_match(char *line, regmatch_t *match){
319 +        char *ptr;
320 +        long long num;
321 +
322 +        ptr=line+match->rm_so;
323 +        num=atoll(ptr);
324 +
325 +        return num;
326 + }
327 + #endif
328 +
329   /*      $OpenBSD: strlcpy.c,v 1.8 2003/06/17 21:56:24 millert Exp $     */
330  
331   /*
# Line 486 | Line 491 | struct uvmexp *sg_get_uvmexp() {
491          }
492  
493          return &uvm;
494 + }
495 + #endif
496 +
497 + #ifdef HPUX
498 + struct pst_static *sg_get_pstat_static() {
499 +        static int got = 0;
500 +        static struct pst_static pst;
501 +
502 +        if (!got) {
503 +                if (pstat_getstatic(&pst, sizeof pst, 1, 0) == -1) {
504 +                        sg_set_error_with_errno(SG_ERROR_PSTAT,
505 +                                                "pstat_static");
506 +                        return NULL;
507 +                }
508 +                got = 1;
509 +        }
510 +        return &pst;
511   }
512   #endif
513  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines