--- Begin Message ---
Package: mtr
Version: 0.54-1
Severity: minor
Tags: upstream patch
foo.
-- System Information:
Debian Release: testing/unstable
Architecture: i386
Kernel: Linux pc-debian 2.4.20-3-k7-smp #1 SMP Sun Jun 8 02:32:21 EST 2003 i686
Locale: LANG=C, LC_CTYPE=C
Versions of packages mtr depends on:
ii libc6 2.3.1-17 GNU C Library: Shared libraries an
ii libglib1.2 1.2.10-9 The GLib library of C routines
ii libgtk1.2 1.2.10-16 The GIMP Toolkit set of widgets fo
ii libncurses5 5.3.20030510-2 Shared libraries for terminal hand
ii xlibs 4.2.1-8 X Window System client libraries
-- no debconf information
diff -burN mtr-0.54.old/display.h mtr-0.54/display.h
--- mtr-0.54.old/display.h 2003-05-03 11:52:01.000000000 +0200
+++ mtr-0.54/display.h 2003-06-15 01:08:33.000000000 +0200
@@ -23,14 +23,14 @@
/* Prototypes for display.c */
void display_detect(int *argc, char ***argv);
-void display_open();
-void display_close();
-void display_redraw();
+void display_open(void);
+void display_close(void);
+void display_redraw(void);
void display_rawping(int hostnum, int msec);
void display_rawhost(int hostnum, int ip_addr);
-int display_keyaction();
-void display_loop();
-void display_clear();
+int display_keyaction(void);
+void display_loop(void);
+void display_clear(void);
extern int display_mode;
extern int use_dns;
diff -burN mtr-0.54.old/dns.c mtr-0.54/dns.c
--- mtr-0.54.old/dns.c 2002-11-23 19:24:16.000000000 +0100
+++ mtr-0.54/dns.c 2003-06-15 01:12:54.000000000 +0200
@@ -42,6 +42,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
+#include <time.h>
#ifdef NO_STRERROR
extern int sys_nerr;
@@ -50,7 +51,9 @@
#endif
/* Hmm, it seems Irix requires this */
+#ifndef errno
extern int errno;
+#endif
/* Defined in mtr.c */
extern int dns;
@@ -422,11 +425,11 @@
return 0;
}
-int dns_waitfd(){
+int dns_waitfd(void){
return resfd;
}
-void dns_open(){
+void dns_open(void){
int option,i;
res_init();
if (!_res.nscount){
@@ -456,7 +459,7 @@
}
}
-struct resolve *allocresolve(){
+struct resolve *allocresolve(void){
struct resolve *rp;
rp = (struct resolve *)statmalloc(sizeof(struct resolve));
if (!rp){
@@ -817,11 +820,11 @@
int r,usefulanswer;
word rr,datatype,class,qdatatype,qclass;
byte rdatalength;
- if (l < sizeof(packetheader)){
+ if ((size_t) l < sizeof(packetheader)){
restell("Resolver error: Packet smaller than standard header size.");
return;
}
- if (l == sizeof(packetheader)){
+ if ((size_t) l == sizeof(packetheader)){
restell("Resolver error: Packet has empty body.");
return;
}
@@ -1071,7 +1074,7 @@
}
}
-void dns_ack(){
+void dns_ack(void){
int r,i;
r = recvfrom(resfd,(byte *)resrecvbuf,MaxPacketsize,0,(struct sockaddr *)&from,&fromlen);
if (r > 0){
diff -burN mtr-0.54.old/dns.h mtr-0.54/dns.h
--- mtr-0.54.old/dns.h 2002-03-07 13:19:11.000000000 +0100
+++ mtr-0.54/dns.h 2003-06-15 01:08:38.000000000 +0200
@@ -19,9 +19,9 @@
/* Prototypes for dns.c */
-void dns_open();
-int dns_waitfd();
-void dns_ack();
+void dns_open(void);
+int dns_waitfd(void);
+void dns_ack(void);
void dns_events(double *sinterval);
char *dns_lookup(int address);
char *dns_lookup2(int address);
diff -burN mtr-0.54.old/getopt.h mtr-0.54/getopt.h
--- mtr-0.54.old/getopt.h 2002-03-07 13:19:11.000000000 +0100
+++ mtr-0.54/getopt.h 2003-06-15 01:08:51.000000000 +0200
@@ -101,7 +101,7 @@
errors, only prototype getopt for the GNU C library. */
extern int getopt (int argc, char *const *argv, const char *shortopts);
#else /* not __GNU_LIBRARY__ */
-extern int getopt ();
+extern int getopt (void);
#endif /* __GNU_LIBRARY__ */
extern int getopt_long (int argc, char *const *argv, const char *shortopts,
const struct option *longopts, int *longind);
@@ -115,11 +115,11 @@
const struct option *longopts, int *longind,
int long_only);
#else /* not __STDC__ */
-extern int getopt ();
-extern int getopt_long ();
-extern int getopt_long_only ();
+extern int getopt (void);
+extern int getopt_long (void);
+extern int getopt_long_only (void);
-extern int _getopt_internal ();
+extern int _getopt_internal (void);
#endif /* __STDC__ */
#ifdef __cplusplus
diff -burN mtr-0.54.old/gtk.c mtr-0.54/gtk.c
--- mtr-0.54.old/gtk.c 2002-11-23 18:15:03.000000000 +0100
+++ mtr-0.54/gtk.c 2003-06-15 01:13:24.000000000 +0200
@@ -22,7 +22,10 @@
#include <sys/time.h>
#ifndef NO_GTK
+#include <stdio.h>
#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
#include <gtk/gtk.h>
#include "net.h"
@@ -32,6 +35,11 @@
#include "img/mtr_icon.xpm"
#endif
+#ifdef __GNUC__
+#define unused __attribute__((__unused__))
+#else
+#define unused
+#endif
gint gtk_ping(gpointer data);
@@ -61,7 +69,7 @@
}
}
-int gtk_detect(int *argc, char ***argv) {
+int gtk_detect(unused int *argc, unused char ***argv) {
if(getenv("DISPLAY") != NULL) {
/* If we do this here, gtk_init exits on an error. This happens
BEFORE the user has had a chance to tell us not to use the
@@ -72,13 +80,13 @@
}
}
-gint Window_destroy(GtkWidget *Window, gpointer data) {
+gint Window_destroy(unused GtkWidget *Window, unused gpointer data) {
gtk_main_quit();
return FALSE;
}
-gint Restart_clicked(GtkWidget *Button, gpointer data) {
+gint Restart_clicked(unused GtkWidget *Button, unused gpointer data) {
net_reset();
gtk_redraw();
@@ -86,7 +94,7 @@
}
-gint Pause_clicked(GtkWidget *Button, gpointer data) {
+gint Pause_clicked(unused GtkWidget *Button, unused gpointer data) {
static int paused = 0;
if (paused) {
@@ -109,7 +117,7 @@
* What's the problem with this? (-> "I don't think so) -- REW
*/
-gint WaitTime_changed(GtkAdjustment *Adj, GtkWidget *Button) {
+gint WaitTime_changed(unused GtkAdjustment *Adj, unused GtkWidget *Button) {
WaitTime = gtk_spin_button_get_value_as_float(GTK_SPIN_BUTTON(Button));
gtk_timeout_remove (tag);
gtk_add_ping_timeout ();
@@ -118,7 +126,7 @@
return FALSE;
}
-gint Host_activate(GtkWidget *Entry, gpointer data) {
+gint Host_activate(GtkWidget *Entry, unused gpointer data) {
int addr;
addr = dns_forward(gtk_entry_get_text(GTK_ENTRY(Entry)));
@@ -200,7 +208,7 @@
GtkWidget *GetRow(int index) {
int addr;
- char str[256], *name;
+ char *name;
GtkWidget *Row, *Label;
Row = gtk_fixed_new();
@@ -223,7 +231,7 @@
return Row;
}
-GtkWidget *Scrollarea_create() {
+GtkWidget *Scrollarea_create(void) {
GtkWidget *List;
GtkWidget *scroll;
int count;
@@ -402,7 +410,7 @@
return 0;
}
-gint gtk_ping(gpointer data) {
+gint gtk_ping(unused gpointer data) {
gtk_redraw();
net_send_batch();
gtk_timeout_remove (tag);
@@ -410,11 +418,11 @@
return TRUE;
}
-void gtk_net_data(gpointer data, gint fd, GdkInputCondition cond) {
+void gtk_net_data(unused gpointer data, unused gint fd, unused GdkInputCondition cond) {
net_process_return();
}
-void gtk_dns_data(gpointer data, gint fd, GdkInputCondition cond) {
+void gtk_dns_data(unused gpointer data, unused gint fd, unused GdkInputCondition cond) {
dns_ack();
gtk_redraw();
diff -burN mtr-0.54.old/mtr-curses.h mtr-0.54/mtr-curses.h
--- mtr-0.54.old/mtr-curses.h 2002-03-07 13:19:11.000000000 +0100
+++ mtr-0.54/mtr-curses.h 2003-06-15 01:09:01.000000000 +0200
@@ -18,8 +18,8 @@
*/
/* Prototypes for curses.c */
-void mtr_curses_open();
-void mtr_curses_close();
-void mtr_curses_redraw();
-int mtr_curses_keyaction();
-void mtr_curses_clear();
+void mtr_curses_open(void);
+void mtr_curses_close(void);
+void mtr_curses_redraw(void);
+int mtr_curses_keyaction(void);
+void mtr_curses_clear(void);
diff -burN mtr-0.54.old/mtr-gtk.h mtr-0.54/mtr-gtk.h
--- mtr-0.54.old/mtr-gtk.h 2002-03-07 13:19:11.000000000 +0100
+++ mtr-0.54/mtr-gtk.h 2003-06-15 01:09:06.000000000 +0200
@@ -19,8 +19,8 @@
/* Prototypes for gtk.c */
int gtk_detect(int *argc, char ***argv);
-void gtk_open();
-void gtk_close();
-void gtk_redraw();
-int gtk_keyaction();
-void gtk_loop();
+void gtk_open(void);
+void gtk_close(void);
+void gtk_redraw(void);
+int gtk_keyaction(void);
+void gtk_loop(void);
diff -burN mtr-0.54.old/mtr.c mtr-0.54/mtr.c
--- mtr-0.54.old/mtr.c 2003-04-22 17:25:16.000000000 +0200
+++ mtr-0.54/mtr.c 2003-06-14 17:13:23.000000000 +0200
@@ -147,11 +147,11 @@
argv[0] = "mtr";
argc = 1;
p = strtok (string, " \t");
- while (p && (argc < (sizeof(argv)/sizeof(argv[0])))) {
+ while (p != NULL && ((size_t) argc < (sizeof(argv)/sizeof(argv[0])))) {
argv[argc++] = p;
p = strtok (NULL, " \t");
}
- if (p) {
+ if (p != NULL) {
fprintf (stderr, "Warning: extra arguments ignored: %s", p);
}
diff -burN mtr-0.54.old/net.c mtr-0.54/net.c
--- mtr-0.54.old/net.c 2002-11-23 18:24:05.000000000 +0100
+++ mtr-0.54/net.c 2003-06-15 01:10:22.000000000 +0200
@@ -286,7 +286,7 @@
num = recvfrom(recvsock, packet, 2048, 0,
(struct sockaddr *)&fromaddr, &fromaddrsize);
- if(num < sizeof(struct IPHeader) + sizeof(struct ICMPHeader))
+ if((size_t) num < sizeof(struct IPHeader) + sizeof(struct ICMPHeader))
return;
header = (struct ICMPHeader *)(packet + sizeof(struct IPHeader));
@@ -296,7 +296,7 @@
net_process_ping(header->sequence, fromaddr.sin_addr.s_addr, now);
} else if(header->type == ICMP_TIME_EXCEEDED) {
- if(num < sizeof(struct IPHeader) + sizeof(struct ICMPHeader) +
+ if((size_t) num < sizeof(struct IPHeader) + sizeof(struct ICMPHeader) +
sizeof(struct IPHeader) + sizeof(struct ICMPHeader))
return;
@@ -484,12 +484,12 @@
gettimeofday(&reset, NULL);
}
-void net_close() {
+void net_close(void) {
close(sendsock);
close(recvsock);
}
-int net_waitfd() {
+int net_waitfd(void) {
return recvsock;
}
@@ -498,7 +498,7 @@
return host[at].saved;
}
-void net_save_increment()
+void net_save_increment(void)
{
int at;
for (at = 0; at < MaxHost; at++) {
diff -burN mtr-0.54.old/net.h mtr-0.54/net.h
--- mtr-0.54.old/net.h 2002-11-23 01:30:49.000000000 +0100
+++ mtr-0.54/net.h 2003-06-15 01:08:12.000000000 +0200
@@ -19,22 +19,22 @@
/* Prototypes for functions in net.c */
-int net_preopen();
+int net_preopen(void);
int net_open(int address);
void net_reopen(int address);
-void net_reset();
-void net_close();
-int net_waitfd();
-void net_process_return();
-int net_max();
+void net_reset(void);
+void net_close(void);
+int net_waitfd(void);
+void net_process_return(void);
+int net_max(void);
int net_addr(int at);
int net_percent(int at);
int net_best(int at);
int net_worst(int at);
int net_last(int at);
int net_avg(int at);
-int net_send_batch();
-void net_end_transit();
+int net_send_batch(void);
+void net_end_transit(void);
int calc_deltatime (float WaitTime);
diff -burN mtr-0.54.old/report.h mtr-0.54/report.h
--- mtr-0.54.old/report.h 2002-03-07 13:19:11.000000000 +0100
+++ mtr-0.54/report.h 2003-06-15 01:09:18.000000000 +0200
@@ -19,5 +19,5 @@
/* Prototypes for report.h */
-void report_open();
-void report_close();
+void report_open(void);
+void report_close(void);
diff -burN mtr-0.54.old/select.c mtr-0.54/select.c
--- mtr-0.54.old/select.c 2003-05-03 12:05:16.000000000 +0200
+++ mtr-0.54/select.c 2003-06-15 01:13:46.000000000 +0200
@@ -42,7 +42,7 @@
int display_offset = 0;
-void select_loop() {
+void select_loop(void) {
fd_set readfd;
int anyset;
int action, maxfd;
diff -burN mtr-0.54.old/select.h mtr-0.54/select.h
--- mtr-0.54.old/select.h 2002-03-07 13:19:11.000000000 +0100
+++ mtr-0.54/select.h 2003-06-15 01:09:23.000000000 +0200
@@ -17,4 +17,4 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-void select_loop();
+void select_loop(void);
diff -burN mtr-0.54.old/split.h mtr-0.54/split.h
--- mtr-0.54.old/split.h 2002-03-07 13:19:11.000000000 +0100
+++ mtr-0.54/split.h 2003-06-15 01:09:32.000000000 +0200
@@ -20,7 +20,7 @@
*/
/* Prototypes for split.c */
-void split_open();
-void split_close();
-void split_redraw();
-int split_keyaction();
+void split_open(void);
+void split_close(void);
+void split_redraw(void);
+int split_keyaction(void);
--- End Message ---
