瀏覽代碼

[DCCP]: Fix compiler warnings

may be a false warning if there always is something on ccid3hcrx_hist:

net/dccp/ccids/ccid3.c: In function 'ccid3_hc_rx_packet_recv':
net/dccp/ccids/ccid3.c:1634: warning: 'tstamp.tv_usec' may be used uninitialized in this function
net/dccp/ccids/ccid3.c:1634: warning: 'tstamp.tv_sec' may be used uninitialized in this function

const on inline functions doesn't have any effect:

net/dccp/dccp.h:64: warning: type qualifiers ignored on function return type
net/dccp/dccp.h:70: warning: type qualifiers ignored on function return type
net/dccp/dccp.h:76: warning: type qualifiers ignored on function return type

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Patrick McHardy 20 年之前
父節點
當前提交
a10cedd4b9
共有 2 個文件被更改,包括 6 次插入7 次删除
  1. 1 1
      net/dccp/ccids/ccid3.c
  2. 5 6
      net/dccp/dccp.h

+ 1 - 1
net/dccp/ccids/ccid3.c

@@ -1634,7 +1634,7 @@ static u32 ccid3_hc_rx_calc_first_li(struct sock *sk)
 	struct ccid3_hc_rx_sock *hcrx = dp->dccps_hc_rx_ccid_private;
 	struct dccp_rx_hist_entry *entry, *next, *tail = NULL;
 	u32 rtt, delta, x_recv, fval, p, tmp2;
-	struct timeval tstamp, tmp_tv;
+	struct timeval tstamp = { 0 }, tmp_tv;
 	int interval = 0;
 	int win_count = 0;
 	int step = 0;

+ 5 - 6
net/dccp/dccp.h

@@ -60,20 +60,19 @@ extern void dccp_time_wait(struct sock *sk, int state, int timeo);
 extern struct proto dccp_v4_prot;
 
 /* is seq1 < seq2 ? */
-static inline const  int before48(const u64 seq1, const u64 seq2)
+static inline int before48(const u64 seq1, const u64 seq2)
 {
-	return (const s64)((seq1 << 16) - (seq2 << 16)) < 0;
+	return (s64)((seq1 << 16) - (seq2 << 16)) < 0;
 }
 
 /* is seq1 > seq2 ? */
-static inline const  int after48(const u64 seq1, const u64 seq2)
+static inline int after48(const u64 seq1, const u64 seq2)
 {
-	return (const s64)((seq2 << 16) - (seq1 << 16)) < 0;
+	return (s64)((seq2 << 16) - (seq1 << 16)) < 0;
 }
 
 /* is seq2 <= seq1 <= seq3 ? */
-static inline const int between48(const u64 seq1, const u64 seq2,
-				  const u64 seq3)
+static inline int between48(const u64 seq1, const u64 seq2, const u64 seq3)
 {
 	return (seq3 << 16) - (seq2 << 16) >= (seq1 << 16) - (seq2 << 16);
 }