Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
  • 2 commits
  • 1 file changed
  • 0 comments
  • 2 contributors
Nov 02, 2011
Werner Almesberger input.c: remove unnecessary casts
This patch to Flickernoise removes a number of casts that serve no
purpose and - in the case of handle_midi_msg - clutter code that
needs some more fixing.

I didn't run the code but I checked that the assembler output is
equivalent. It's not identical because the line numbers of four
asserts changed.

There is a bit more redundancy in the form of

  ... | (foo << bar) | ...

which could be written as

  ... | foo << bar | ...

I didn't touch these since some people prefer the parentheses as
part of their coding style. If you want such things gone as well,
please let me know.

- Werner
5447460
Sébastien Bourdeauducq Merge branch 'master' of github.com:milkymist/flickernoise 2d66a34

Showing 1 changed file with 5 additions and 8 deletions. Show diff stats Hide diff stats

  1. 13  src/input.c
13  src/input.c
@@ -67,10 +67,7 @@ static int handle_mouse_event(mtk_event *e, unsigned char *msg)
67 67
 	unsigned int mstate;
68 68
 	int n;
69 69
 
70  
-	mstate = ((unsigned int)msg[0] << 24)
71  
-		|((unsigned int)msg[1] << 16)
72  
-		|((unsigned int)msg[2] << 8)
73  
-		|((unsigned int)msg[3]);
  70
+	mstate = (msg[0] << 24) | (msg[1] << 16) | (msg[2] << 8) | msg[3];
74 71
 
75 72
 	n = 0;
76 73
 	/* left mouse button pressed */
@@ -237,19 +234,19 @@ static int handle_ir_event(mtk_event *e, unsigned char *msg)
237 234
 
238 235
 static int handle_midi_msg(mtk_event *e, unsigned char *msg)
239 236
 {
240  
-	e->press.code = ((unsigned int)(msg[0]) & 0x0f) << 16; /* set channel */
  237
+	e->press.code = (msg[0] & 0x0f) << 16; /* set channel */
241 238
 	switch(msg[0] & 0xf0) {
242 239
 		case 0x90: /* Note On */
243 240
 			e->type = EVENT_TYPE_MIDI_NOTEON;
244  
-			e->press.code |= (unsigned int)msg[1];
  241
+			e->press.code |= msg[1];
245 242
 			return 1;
246 243
 		case 0xb0: /* Controller */
247 244
 			e->type = EVENT_TYPE_MIDI_CONTROLLER;
248  
-			e->press.code |= ((unsigned int)msg[1] << 8) | (unsigned int)msg[2];
  245
+			e->press.code |= (msg[1] << 8) | msg[2];
249 246
 			return 1;
250 247
 		case 0xe0: /* Pitch */
251 248
 			e->type = EVENT_TYPE_MIDI_PITCH;
252  
-			e->press.code |= (unsigned int)msg[2];
  249
+			e->press.code |= msg[2];
253 250
 			return 1;
254 251
 		default:
255 252
 			return 0;

No commit comments for this range

Something went wrong with that request. Please try again.