replace *a lot* of file related calls by their GLib counterparts. This is necessary...

[obnox/wireshark/wip.git] / tap-rpcprogs.c

diff --git a/tap-rpcprogs.c b/tap-rpcprogs.c
index 3c7b48842031aa7ee1ba074e78cea7a816841843..533db827fa3db3dc07f7e5900818553d392f3062 100644 (file)
--- a/tap-rpcprogs.c
+++ b/tap-rpcprogs.c
@@ -38,7 +38,8 @@
 
 #include <string.h>
 #include "epan/packet_info.h"
-#include "tap.h"
+#include <epan/tap.h>
+#include <epan/stat_cmd_args.h>
 #include <epan/dissectors/packet-rpc.h>
 #include "register.h"
 
@@ -57,9 +58,9 @@ static rpc_program_t *prog_list=NULL;
 static int already_enabled=0;
 
 static int
-rpcprogs_packet(void *dummy1 _U_, packet_info *pinfo, epan_dissect_t *edt _U_, void *pri)
+rpcprogs_packet(void *dummy1 _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pri)
 {
-       rpc_call_info_value *ri=pri;
+       const rpc_call_info_value *ri=pri;
        nstime_t delta;
        rpc_program_t *rp=NULL;
 
@@ -134,12 +135,7 @@ rpcprogs_packet(void *dummy1 _U_, packet_info *pinfo, epan_dissect_t *edt _U_, v
        }
 
        /* calculate time delta between request and reply */
-       delta.secs=pinfo->fd->abs_secs-ri->req_time.secs;
-       delta.nsecs=pinfo->fd->abs_usecs*1000-ri->req_time.nsecs;
-       if(delta.nsecs<0){
-               delta.nsecs+=1000000000;
-               delta.secs--;
-       }
+       nstime_delta(&delta, &pinfo->fd->abs_ts, &ri->req_time);
 
        if((rp->max.secs==0)
        && (rp->max.nsecs==0) ){
@@ -205,7 +201,7 @@ rpcprogs_draw(void *dummy _U_)
                        td=0;
                }
 
-               sprintf(str,"%s(%d)",rpc_prog_name(rp->program),rp->program);
+               g_snprintf(str, sizeof(str), "%s(%d)",rpc_prog_name(rp->program),rp->program);
                printf("%-15s %2d %6d %3d.%05d %3d.%05d %3d.%05d\n",
                        str,
                        rp->version,
@@ -220,7 +216,7 @@ rpcprogs_draw(void *dummy _U_)
 
 
 static void
-rpcprogs_init(char *optarg _U_)
+rpcprogs_init(const char *optarg _U_)
 {
        GString *error_string;
 
@@ -242,7 +238,7 @@ rpcprogs_init(char *optarg _U_)
 void
 register_tap_listener_rpcprogs(void)
 {
-       register_ethereal_tap("rpc,programs", rpcprogs_init);
+       register_stat_cmd_arg("rpc,programs", rpcprogs_init);
 }