diff options
author | guanglei <guanglei> | 2006-06-02 01:58:05 +0000 |
---|---|---|
committer | guanglei <guanglei> | 2006-06-02 01:58:05 +0000 |
commit | 3b308385ab9aa306eabac5fa6b67ef9e17106e98 (patch) | |
tree | 4cbd60e61c9e450a89c987fd826e794c4d17ccf9 | |
parent | ffb0b3adb38e4d1fdf7c09b9b70ae7baa9ea71b5 (diff) | |
download | systemtap-steved-3b308385ab9aa306eabac5fa6b67ef9e17106e98.tar.gz systemtap-steved-3b308385ab9aa306eabac5fa6b67ef9e17106e98.tar.xz systemtap-steved-3b308385ab9aa306eabac5fa6b67ef9e17106e98.zip |
eliminate lket-b2a compiling warnings on in 64-bit mode
-rw-r--r-- | runtime/ChangeLog | 4 | ||||
-rw-r--r-- | runtime/lket/b2a/lket_b2a.c | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/runtime/ChangeLog b/runtime/ChangeLog index 3554a89b..ef555303 100644 --- a/runtime/ChangeLog +++ b/runtime/ChangeLog @@ -1,3 +1,7 @@ +2006-06-02 Li Guanglei <guanglei@cn.ibm.com> + + * lket/b2a/lket_b2a.c: eliminate some compile warnings + 2006-06-01 Li Guanglei <guanglei@cn.ibm.com> * lket/b2a/lket_b2a.h, lket/b2a/lket_b2a.c: make it able to diff --git a/runtime/lket/b2a/lket_b2a.c b/runtime/lket/b2a/lket_b2a.c index be78c302..91528f07 100644 --- a/runtime/lket/b2a/lket_b2a.c +++ b/runtime/lket/b2a/lket_b2a.c @@ -226,14 +226,14 @@ void register_appname(int i, FILE *fp, lket_pkt_header *phdr) free(appname); return; } - g_tree_insert(appNameTree, (gpointer)pid, (gpointer)appname); + g_tree_insert(appNameTree, (gpointer)((long)pid), (gpointer)appname); } gint compareFunc(gconstpointer a, gconstpointer b, gpointer user_data) { - if((int)(a) > (int)(b)) return 1; - else if ((int)(a) < (int)(b)) return -1; + if((long)(a) > (long)(b)) return 1; + else if ((long)(a) < (long)(b)) return -1; else return 0; } @@ -402,7 +402,7 @@ void print_pkt_header(FILE *fp, lket_pkt_header *phdr) fprintf(fp, "%lld.%lld APPNAME: %s PID:%d PPID:%d TID:%d CPU:%d HOOKGRP:%d HOOKID:%d HOOKDATA:", (phdr->sec*1000000LL + phdr->usec - start_timestamp)/1000000LL, (phdr->sec*1000000LL + phdr->usec- start_timestamp)%1000000LL, - (char *)(g_tree_lookup(appNameTree, (gconstpointer)phdr->pid)), + (char *)(g_tree_lookup(appNameTree, (gconstpointer)((long)phdr->pid))), phdr->pid, phdr->ppid, phdr->tid, @@ -492,9 +492,9 @@ void b2a_vsnprintf(const char *fmt, FILE *infp, FILE *outfile, size_t size) else if (qualifier == 'L') { if(readbytes + sizeof(long long) > size) goto filled; - fread(&lltemp, sizeof(long long), 1, infp); + fread(&lltemp, sizeof(int64_t), 1, infp); readbytes += sizeof(long long); - fprintf(outfile,"%lld ", (long long)lltemp); + fprintf(outfile,"%lld ", lltemp); } else { if(readbytes + 4 > size) @@ -523,7 +523,7 @@ void b2a_vsnprintf(const char *fmt, FILE *infp, FILE *outfile, size_t size) break; case 8: fread(&lltemp, 8, 1, infp); - fprintf(outfile, "%lld ",(int64_t)lltemp); + fprintf(outfile, "%lld ",lltemp); break; case 4: default: |