Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 1f5299b

Browse files
author
Neil Conway
committed
Replace the use of "0" with "NULL" where appropriate in dllist.c, for
good style and to satisfy sparse. From Alvaro Herrera.
1 parent b4e7e9a commit 1f5299b

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

src/backend/lib/dllist.c

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $PostgreSQL: pgsql/src/backend/lib/dllist.c,v 1.30 2004/12/31 21:59:48 pgsql Exp $
12+
* $PostgreSQL: pgsql/src/backend/lib/dllist.c,v 1.31 2005/01/18 22:59:32 neilc Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -43,17 +43,17 @@ DLNewList(void)
4343
errmsg("out of memory")));
4444
#endif
4545
}
46-
l->dll_head = 0;
47-
l->dll_tail = 0;
46+
l->dll_head = NULL;
47+
l->dll_tail = NULL;
4848

4949
return l;
5050
}
5151

5252
void
5353
DLInitList(Dllist *list)
5454
{
55-
list->dll_head = 0;
56-
list->dll_tail = 0;
55+
list->dll_head = NULL;
56+
list->dll_tail = NULL;
5757
}
5858

5959
/*
@@ -65,7 +65,7 @@ DLFreeList(Dllist *list)
6565
{
6666
Dlelem *curr;
6767

68-
while ((curr = DLRemHead(list)) != 0)
68+
while ((curr = DLRemHead(list)) != NULL)
6969
free(curr);
7070

7171
free(list);
@@ -88,20 +88,20 @@ DLNewElem(void *val)
8888
errmsg("out of memory")));
8989
#endif
9090
}
91-
e->dle_next = 0;
92-
e->dle_prev = 0;
91+
e->dle_next = NULL;
92+
e->dle_prev = NULL;
9393
e->dle_val = val;
94-
e->dle_list = 0;
94+
e->dle_list = NULL;
9595
return e;
9696
}
9797

9898
void
9999
DLInitElem(Dlelem *e, void *val)
100100
{
101-
e->dle_next = 0;
102-
e->dle_prev = 0;
101+
e->dle_next = NULL;
102+
e->dle_prev = NULL;
103103
e->dle_val = val;
104-
e->dle_list = 0;
104+
e->dle_list = NULL;
105105
}
106106

107107
void
@@ -132,9 +132,9 @@ DLRemove(Dlelem *e)
132132
l->dll_tail = e->dle_prev;
133133
}
134134

135-
e->dle_next = 0;
136-
e->dle_prev = 0;
137-
e->dle_list = 0;
135+
e->dle_next = NULL;
136+
e->dle_prev = NULL;
137+
e->dle_list = NULL;
138138
}
139139

140140
void
@@ -145,10 +145,10 @@ DLAddHead(Dllist *l, Dlelem *e)
145145
if (l->dll_head)
146146
l->dll_head->dle_prev = e;
147147
e->dle_next = l->dll_head;
148-
e->dle_prev = 0;
148+
e->dle_prev = NULL;
149149
l->dll_head = e;
150150

151-
if (l->dll_tail == 0) /* if this is first element added */
151+
if (l->dll_tail == NULL) /* if this is first element added */
152152
l->dll_tail = e;
153153
}
154154

@@ -160,10 +160,10 @@ DLAddTail(Dllist *l, Dlelem *e)
160160
if (l->dll_tail)
161161
l->dll_tail->dle_next = e;
162162
e->dle_prev = l->dll_tail;
163-
e->dle_next = 0;
163+
e->dle_next = NULL;
164164
l->dll_tail = e;
165165

166-
if (l->dll_head == 0) /* if this is first element added */
166+
if (l->dll_head == NULL) /* if this is first element added */
167167
l->dll_head = e;
168168
}
169169

@@ -173,19 +173,19 @@ DLRemHead(Dllist *l)
173173
/* remove and return the head */
174174
Dlelem *result = l->dll_head;
175175

176-
if (result == 0)
176+
if (result == NULL)
177177
return result;
178178

179179
if (result->dle_next)
180-
result->dle_next->dle_prev = 0;
180+
result->dle_next->dle_prev = NULL;
181181

182182
l->dll_head = result->dle_next;
183183

184184
if (result == l->dll_tail) /* if the head is also the tail */
185-
l->dll_tail = 0;
185+
l->dll_tail = NULL;
186186

187-
result->dle_next = 0;
188-
result->dle_list = 0;
187+
result->dle_next = NULL;
188+
result->dle_list = NULL;
189189

190190
return result;
191191
}
@@ -196,19 +196,19 @@ DLRemTail(Dllist *l)
196196
/* remove and return the tail */
197197
Dlelem *result = l->dll_tail;
198198

199-
if (result == 0)
199+
if (result == NULL)
200200
return result;
201201

202202
if (result->dle_prev)
203-
result->dle_prev->dle_next = 0;
203+
result->dle_prev->dle_next = NULL;
204204

205205
l->dll_tail = result->dle_prev;
206206

207207
if (result == l->dll_head) /* if the tail is also the head */
208-
l->dll_head = 0;
208+
l->dll_head = NULL;
209209

210-
result->dle_prev = 0;
211-
result->dle_list = 0;
210+
result->dle_prev = NULL;
211+
result->dle_list = NULL;
212212

213213
return result;
214214
}
@@ -222,7 +222,7 @@ DLMoveToFront(Dlelem *e)
222222
if (l->dll_head == e)
223223
return; /* Fast path if already at front */
224224

225-
Assert(e->dle_prev != 0); /* since it's not the head */
225+
Assert(e->dle_prev != NULL); /* since it's not the head */
226226
e->dle_prev->dle_next = e->dle_next;
227227

228228
if (e->dle_next)
@@ -236,7 +236,7 @@ DLMoveToFront(Dlelem *e)
236236

237237
l->dll_head->dle_prev = e;
238238
e->dle_next = l->dll_head;
239-
e->dle_prev = 0;
239+
e->dle_prev = NULL;
240240
l->dll_head = e;
241241
/* We need not check dll_tail, since there must have been > 1 entry */
242242
}

0 commit comments

Comments
 (0)