Skip to content

Commit fc720e7

Browse files
ElyesHH. Peter Anvin
authored andcommitted
Remove useless parentheses in return statements
Signed-off-by: Elyes Haouas <[email protected]> Signed-off-by: H. Peter Anvin (Intel) <[email protected]>
1 parent f6a17a2 commit fc720e7

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
lines changed

output/outieee.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1171,7 +1171,7 @@ static int32_t ieee_putld(int32_t start, int32_t end, uint8_t *buf)
11711171
start++;
11721172
}
11731173
ieee_putascii(".\n");
1174-
return (start);
1174+
return start;
11751175
}
11761176
static int32_t ieee_putlr(struct ieeeFixupp *p)
11771177
{
@@ -1237,7 +1237,7 @@ static int32_t ieee_putlr(struct ieeeFixupp *p)
12371237
}
12381238
ieee_putascii("LR(%s,%"PRIX32").\n", buf, size);
12391239

1240-
return (size);
1240+
return size;
12411241
}
12421242

12431243
/* Dump all segment data (text and fixups )*/

output/outmacho.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1106,7 +1106,7 @@ extern macros_t macho_stdmac[];
11061106
static int layout_compare (const struct symbol **s1,
11071107
const struct symbol **s2)
11081108
{
1109-
return (strcmp ((*s1)->name, (*s2)->name));
1109+
return strcmp ((*s1)->name, (*s2)->name);
11101110
}
11111111

11121112
/* The native assembler does a few things in a similar function

output/outobj.c

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ static ObjRecord *obj_clear(ObjRecord * orp)
165165
orp->child = NULL;
166166
orp->up = NULL;
167167
orp->back = NULL;
168-
return (orp);
168+
return orp;
169169
}
170170

171171
/*
@@ -190,7 +190,7 @@ static ObjRecord *obj_emit(ObjRecord * orp)
190190
nasm_free(orp->child);
191191
}
192192

193-
return (obj_clear(orp));
193+
return obj_clear(orp);
194194
}
195195

196196
/*
@@ -199,7 +199,7 @@ static ObjRecord *obj_emit(ObjRecord * orp)
199199
static ObjRecord *obj_emit2(ObjRecord * orp)
200200
{
201201
obj_commit(orp);
202-
return (obj_emit(orp));
202+
return obj_emit(orp);
203203
}
204204

205205
/*
@@ -211,7 +211,7 @@ static ObjRecord *obj_new(void)
211211

212212
orp = obj_clear(nasm_malloc(sizeof(ObjRecord)));
213213
orp->ori = ori_null;
214-
return (orp);
214+
return orp;
215215
}
216216

217217
/*
@@ -244,7 +244,7 @@ static ObjRecord *obj_bump(ObjRecord * orp)
244244
nxt->used = nxt->committed + used;
245245
}
246246

247-
return (nxt);
247+
return nxt;
248248
}
249249

250250
/*
@@ -261,7 +261,7 @@ static ObjRecord *obj_check(ObjRecord * orp, int size)
261261
orp->committed = orp->used;
262262
}
263263

264-
return (orp);
264+
return orp;
265265
}
266266

267267
/*
@@ -271,7 +271,7 @@ static ObjRecord *obj_check(ObjRecord * orp, int size)
271271
static ObjRecord *obj_commit(ObjRecord * orp)
272272
{
273273
orp->committed = orp->used;
274-
return (orp);
274+
return orp;
275275
}
276276

277277
/*
@@ -282,7 +282,7 @@ static ObjRecord *obj_byte(ObjRecord * orp, uint8_t val)
282282
orp = obj_check(orp, 1);
283283
orp->buf[orp->used] = val;
284284
orp->used++;
285-
return (orp);
285+
return orp;
286286
}
287287

288288
/*
@@ -294,7 +294,7 @@ static ObjRecord *obj_word(ObjRecord * orp, unsigned int val)
294294
orp->buf[orp->used] = val;
295295
orp->buf[orp->used + 1] = val >> 8;
296296
orp->used += 2;
297-
return (orp);
297+
return orp;
298298
}
299299

300300
/*
@@ -306,7 +306,7 @@ static ObjRecord *obj_rword(ObjRecord * orp, unsigned int val)
306306
orp->buf[orp->used] = val >> 8;
307307
orp->buf[orp->used + 1] = val;
308308
orp->used += 2;
309-
return (orp);
309+
return orp;
310310
}
311311

312312
/*
@@ -320,7 +320,7 @@ static ObjRecord *obj_dword(ObjRecord * orp, uint32_t val)
320320
orp->buf[orp->used + 2] = val >> 16;
321321
orp->buf[orp->used + 3] = val >> 24;
322322
orp->used += 4;
323-
return (orp);
323+
return orp;
324324
}
325325

326326
/*
@@ -338,7 +338,7 @@ static ObjRecord *obj_force(ObjRecord * orp, int x)
338338
if (orp->x_size == (x ^ 48))
339339
orp = obj_bump(orp);
340340
orp->x_size = x;
341-
return (orp);
341+
return orp;
342342
}
343343

344344
/*
@@ -357,7 +357,7 @@ static ObjRecord *obj_x(ObjRecord * orp, uint32_t val)
357357
return nxt;
358358
}
359359
orp->x_size = 16;
360-
return (obj_word(orp, val));
360+
return obj_word(orp, val);
361361
}
362362

363363
/*
@@ -366,8 +366,8 @@ static ObjRecord *obj_x(ObjRecord * orp, uint32_t val)
366366
static ObjRecord *obj_index(ObjRecord * orp, unsigned int val)
367367
{
368368
if (val < 128)
369-
return (obj_byte(orp, val));
370-
return (obj_word(orp, (val >> 8) | (val << 8) | 0x80));
369+
return obj_byte(orp, val);
370+
return obj_word(orp, (val >> 8) | (val << 8) | 0x80);
371371
}
372372

373373
/*
@@ -376,15 +376,15 @@ static ObjRecord *obj_index(ObjRecord * orp, unsigned int val)
376376
static ObjRecord *obj_value(ObjRecord * orp, uint32_t val)
377377
{
378378
if (val <= 128)
379-
return (obj_byte(orp, val));
379+
return obj_byte(orp, val);
380380
if (val <= 0xFFFF) {
381381
orp = obj_byte(orp, 129);
382-
return (obj_word(orp, val));
382+
return obj_word(orp, val);
383383
}
384384
if (val <= 0xFFFFFF)
385-
return (obj_dword(orp, (val << 8) + 132));
385+
return obj_dword(orp, (val << 8) + 132);
386386
orp = obj_byte(orp, 136);
387-
return (obj_dword(orp, val));
387+
return obj_dword(orp, val);
388388
}
389389

390390
/*
@@ -411,7 +411,7 @@ static ObjRecord *obj_name(ObjRecord * orp, const char *name)
411411
name++;
412412
} else
413413
memcpy(ptr, name, len);
414-
return (orp);
414+
return orp;
415415
}
416416

417417
/*

0 commit comments

Comments
 (0)