SoundRecorder: fixed two warnings.

* warnings about comparison between signed and unsigned integer expressions.
* also use std::min() instead of min_c()
This commit is contained in:
Jérôme Duval
2013-04-29 21:35:40 +02:00
parent a83d8d14b5
commit e367c05620
+3 -2
View File
@@ -9,6 +9,7 @@
******************************************************************************/ ******************************************************************************/
#include "FileUtils.h" #include "FileUtils.h"
#include <algorithm>
#include <new> #include <new>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@@ -95,7 +96,7 @@ CopyAttributes(BNode& dst, BNode& src)
uint8 buffer[size]; uint8 buffer[size];
off_t offset = 0; off_t offset = 0;
ssize_t read = src.ReadAttr(attrName, info.type, offset, buffer, ssize_t read = src.ReadAttr(attrName, info.type, offset, buffer,
min_c(size, info.size)); std::min((off_t)size, info.size));
if (read < 0) { if (read < 0) {
fprintf(stderr, "Error reading attribute '%s'\n", attrName); fprintf(stderr, "Error reading attribute '%s'\n", attrName);
return (status_t)read; return (status_t)read;
@@ -113,7 +114,7 @@ CopyAttributes(BNode& dst, BNode& src)
} }
offset += read; offset += read;
read = src.ReadAttr(attrName, info.type, offset, buffer, read = src.ReadAttr(attrName, info.type, offset, buffer,
min_c(size, info.size - offset)); std::min((off_t)size, info.size - offset));
if (read < 0) { if (read < 0) {
fprintf(stderr, "Error reading attribute '%s'\n", attrName); fprintf(stderr, "Error reading attribute '%s'\n", attrName);
return (status_t)read; return (status_t)read;