Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
at fix-function-merge 19 lines 545 B view raw
1--- a/vrb/src/bin/vbuf.c1 2011-06-13 22:14:24.000000000 +0200 2+++ b/vrb/src/bin/vbuf.c 2011-06-13 22:14:43.000000000 +0200 3@@ -426,7 +426,6 @@ 4 int opt_progress ; 5 int output_fd ; 6 int poll_time ; 7- int poll_num ; 8 int poll_write ; 9 int poll_read ; 10 11@@ -861,7 +860,7 @@ 12 poll_time = display_time - get_time_ms(); 13 if ( poll_time < 0 ) poll_time = 0; 14 } 15- poll_num = poll( poll_list, 2, poll_time ); 16+ poll( poll_list, 2, poll_time ); 17 18 //----------------------- 19 // Check for poll events.