From a62f3b9891acf3441791d5a655456e1524165cd4 Mon Sep 17 00:00:00 2001
From: Martin Nilsson <nilsson@opera.com>
Date: Tue, 26 Aug 2014 16:14:57 +0200
Subject: [PATCH] Silence warnings, mostly with useless null inits.
---
src/builtin.cmod | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/builtin.cmod b/src/builtin.cmod
index 402889d839..8392e67222 100644
--- a/src/builtin.cmod
+++ b/src/builtin.cmod
@@ -3088,11 +3088,11 @@ PIKECLASS Buffer
PIKEFUN int|Buffer `[](int index, int|void end_or_none)
{
struct Buffer_struct *str = THIS;
- struct pike_string *s;
- unsigned len = 0,shift;
- void *p;
+ struct pike_string *s = str->str.s;
+ unsigned len = 0,shift = 0;
+ void *p = NULL;
- if (s = str->str.s)
+ if (s)
len = s->len, shift = s->size_shift, p = s->str;
if (args==1) {
@@ -3135,12 +3135,12 @@ PIKECLASS Buffer
PIKEFUN int `[]=(int index, int ch)
{
struct Buffer_struct *str = THIS;
- struct pike_string *s;
- unsigned len = 0,shift;
- void *p;
+ struct pike_string *s = str->str.s;
+ unsigned len = 0,shift = 0;
+ void *p = NULL;
pop_n_elems(args);
- if (s = str->str.s)
+ if (s)
len = s->len, shift = s->size_shift, p = s->str;
if (index<0)
@@ -3388,12 +3388,12 @@ PIKECLASS Buffer
{
struct Buffer_struct *str = THIS, *str2;
struct object *res;
- struct pike_string *s;
- unsigned len = 0,shift;
- void *p;
+ struct pike_string *s = str->str.s;
+ unsigned len = 0,shift = 0;
+ void *p = NULL;
INT_TYPE end,vdiscard;
- if (s = str->str.s)
+ if (s)
len = s->len, shift = s->size_shift, p = s->str;
end = args==1 ? len-1 : end_or_none->u.integer;
--
GitLab