Use MIN.
This commit is contained in:
		 Emanuele Giaquinta
					Emanuele Giaquinta
				
			
				
					committed by
					
						 Max Kellermann
						Max Kellermann
					
				
			
			
				
	
			
			
			 Max Kellermann
						Max Kellermann
					
				
			
						parent
						
							df80ae86ee
						
					
				
				
					commit
					a4f0c7b457
				
			| @@ -181,7 +181,7 @@ osx_render(void *vdata, | |||||||
| 	   } | 	   } | ||||||
| 	 */ | 	 */ | ||||||
|  |  | ||||||
| 	bytesToCopy = od->len < bufferSize ? od->len : bufferSize; | 	bytesToCopy = MIN(od->len, bufferSize); | ||||||
| 	bufferSize = bytesToCopy; | 	bufferSize = bytesToCopy; | ||||||
| 	od->len -= bytesToCopy; | 	od->len -= bytesToCopy; | ||||||
|  |  | ||||||
| @@ -321,7 +321,7 @@ osx_play(void *data, const char *playChunk, size_t size) | |||||||
| 		if (curpos >= od->bufferSize) | 		if (curpos >= od->bufferSize) | ||||||
| 			curpos -= od->bufferSize; | 			curpos -= od->bufferSize; | ||||||
|  |  | ||||||
| 		bytesToCopy = od->bufferSize < size ? od->bufferSize : size; | 		bytesToCopy = MIN(od->bufferSize, size); | ||||||
|  |  | ||||||
| 		while (od->len > od->bufferSize - bytesToCopy) { | 		while (od->len > od->bufferSize - bytesToCopy) { | ||||||
| 			/* DEBUG("osx_play: wait\n"); */ | 			/* DEBUG("osx_play: wait\n"); */ | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user