From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 18 Jun 2002 16:06:14 +0000 (+0000)
Subject: fixed compile warning (conversion between signed and unsigned).
X-Git-Tag: v1.0.3~417
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=12e89c53074f445a237597c47783ea8a56e71367;p=alsa-lib.git

fixed compile warning (conversion between signed and unsigned).
---

diff --git a/src/pcm/pcm_mmap.c b/src/pcm/pcm_mmap.c
index 63c05056..d62b6bcd 100644
--- a/src/pcm/pcm_mmap.c
+++ b/src/pcm/pcm_mmap.c
@@ -119,12 +119,12 @@ static snd_pcm_sframes_t snd_pcm_mmap_write_areas(snd_pcm_t *pcm,
 				   frames, pcm->format);
 		result = snd_pcm_mmap_commit(pcm, pcm_offset, frames);
 		if (result < 0)
-			return xfer > 0 ? xfer : result;
+			return xfer > 0 ? (snd_pcm_sframes_t)xfer : result;
 		offset += result;
 		xfer += result;
 		size -= result;
 	}
-	return xfer;
+	return (snd_pcm_sframes_t)xfer;
 }
 
 static snd_pcm_sframes_t snd_pcm_mmap_read_areas(snd_pcm_t *pcm,
@@ -148,12 +148,12 @@ static snd_pcm_sframes_t snd_pcm_mmap_read_areas(snd_pcm_t *pcm,
 				   frames, pcm->format);
 		result = snd_pcm_mmap_commit(pcm, pcm_offset, frames);
 		if (result < 0)
-			return xfer > 0 ? xfer : result;
+			return xfer > 0 ? (snd_pcm_sframes_t)xfer : result;
 		offset += result;
 		xfer += result;
 		size -= result;
 	}
-	return xfer;
+	return (snd_pcm_sframes_t)xfer;
 }
 
 /**
diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c
index 2aa6b3ee..9cf4f048 100644
--- a/src/pcm/pcm_plugin.c
+++ b/src/pcm/pcm_plugin.c
@@ -338,17 +338,17 @@ static snd_pcm_sframes_t snd_pcm_plugin_write_areas(snd_pcm_t *pcm,
 			snd_pcm_sframes_t res;
 			res = plugin->undo_write(pcm, slave_areas, slave_offset + result, slave_frames, slave_frames - result);
 			if (res < 0)
-				return xfer > 0 ? xfer : res;
+				return xfer > 0 ? (snd_pcm_sframes_t)xfer : res;
 			frames -= res;
 		}
 		snd_atomic_write_end(&plugin->watom);
 		if (result <= 0)
-			return xfer > 0 ? xfer : result;
+			return xfer > 0 ? (snd_pcm_sframes_t)xfer : result;
 		offset += frames;
 		xfer += frames;
 		size -= frames;
 	}
-	return xfer;
+	return (snd_pcm_sframes_t)xfer;
 }
 
 static snd_pcm_sframes_t snd_pcm_plugin_read_areas(snd_pcm_t *pcm,
@@ -381,17 +381,17 @@ static snd_pcm_sframes_t snd_pcm_plugin_read_areas(snd_pcm_t *pcm,
 			
 			res = plugin->undo_read(slave, areas, offset, frames, slave_frames - result);
 			if (res < 0)
-				return xfer > 0 ? xfer : res;
+				return xfer > 0 ? (snd_pcm_sframes_t)xfer : res;
 			frames -= res;
 		}
 		snd_atomic_write_end(&plugin->watom);
 		if (result <= 0)
-			return xfer > 0 ? xfer : result;
+			return xfer > 0 ? (snd_pcm_sframes_t)xfer : result;
 		offset += frames;
 		xfer += frames;
 		size -= frames;
 	}
-	return xfer;
+	return (snd_pcm_sframes_t)xfer;
 }
 
 
@@ -532,7 +532,7 @@ snd_pcm_sframes_t snd_pcm_plugin_avail_update(snd_pcm_t *pcm)
 
 			err = snd_pcm_mmap_begin(slave, &slave_areas, &slave_offset, &slave_frames);
 			if (err < 0)
-				return xfer > 0 ? xfer : err;
+				return xfer > 0 ? (snd_pcm_sframes_t)xfer : err;
 			if (frames > cont)
 				frames = cont;
 			frames = plugin->read(pcm, areas, hw_offset, frames,
@@ -546,11 +546,11 @@ snd_pcm_sframes_t snd_pcm_plugin_avail_update(snd_pcm_t *pcm)
 				
 				res = plugin->undo_read(slave, areas, hw_offset, frames, slave_frames - result);
 				if (res < 0)
-					return xfer > 0 ? xfer : res;
+					return xfer > 0 ? (snd_pcm_sframes_t)xfer : res;
 				frames -= res;
 			}
 			if (result <= 0)
-				return xfer > 0 ? xfer : result;
+				return xfer > 0 ? (snd_pcm_sframes_t)xfer : result;
 			if (frames == cont)
 				hw_offset = 0;
 			else
@@ -559,7 +559,7 @@ snd_pcm_sframes_t snd_pcm_plugin_avail_update(snd_pcm_t *pcm)
 			slave_size -= slave_frames;
 			xfer += frames;
 		}
-		return xfer;
+		return (snd_pcm_sframes_t)xfer;
 	}
 }