You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2009/10/27 13:39:55 UTC
svn commit: r830152 - in /harmony/enhanced/classlib/trunk/modules:
archive/src/main/native/zip/shared/ awt/src/main/native/gl/shared/
awt/src/main/native/jpegdecoder/shared/
instrument/src/main/native/instrument/shared/
luni/src/main/native/hyzip/share...
Author: hindessm
Date: Tue Oct 27 12:39:55 2009
New Revision: 830152
URL: http://svn.apache.org/viewvc?rev=830152&view=rev
Log:
Add brackets to avoid compile warnings about assignment in conditional.
Modified:
harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/shared/zipcache.c
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/gifdecoder.c
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/shared/JpegDecoder.c
harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/shared/inst_agt.c
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/zipcache.c
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/main_hlp.c
Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/shared/zipcache.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/shared/zipcache.c?rev=830152&r1=830151&r2=830152&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/shared/zipcache.c (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/shared/zipcache.c Tue Oct 27 12:39:55 2009
@@ -473,9 +473,9 @@
if (zce->chunkActiveDir == dirEntry)
{
- if (entry =
+ if ((entry =
(HyZipFileEntry *) zipCache_reserveEntry (chunk, sizeof (*entry),
- nameSize + 1))
+ nameSize + 1)))
{
/* add to end of existing entry */
zce->chunkActiveDir->fileList->entryCount++;
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/gifdecoder.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/gifdecoder.c?rev=830152&r1=830151&r2=830152&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/gifdecoder.c (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/shared/gifdecoder.c Tue Oct 27 12:39:55 2009
@@ -413,7 +413,7 @@
*/
GIF_RETVAL skipData(GifDecoder *decoder) {
int dataSize;
- while(dataSize = *(decoder->inputPtr)) {
+ while((dataSize = *(decoder->inputPtr))) {
if(dataSize + 1 > decoder->bytesInBuffer) // Need to load more data, suspending
return STATUS_BUFFER_EMPTY;
@@ -435,7 +435,7 @@
*/
GIF_RETVAL readComment(JNIEnv *env, GifDecoder *decoder) {
int dataSize;
- while(dataSize = *(decoder->inputPtr)) {
+ while((dataSize = *(decoder->inputPtr))) {
if(dataSize + 1 > decoder->bytesInBuffer) // Need to load more data, suspending
return STATUS_BUFFER_EMPTY;
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/shared/JpegDecoder.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/shared/JpegDecoder.c?rev=830152&r1=830151&r2=830152&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/shared/JpegDecoder.c (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/shared/JpegDecoder.c Tue Oct 27 12:39:55 2009
@@ -352,7 +352,7 @@
JOCTET *tmp;
glDecompress->srcMgr.buffer_size += MAX_BUFFER;
- if(tmp = realloc(glDecompress->srcMgr.jpeg_buffer, glDecompress->srcMgr.buffer_size)) {
+ if((tmp = realloc(glDecompress->srcMgr.jpeg_buffer, glDecompress->srcMgr.buffer_size))) {
glDecompress->srcMgr.jpeg_buffer = tmp;
freeInJpegBuffer =
Modified: harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/shared/inst_agt.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/shared/inst_agt.c?rev=830152&r1=830151&r2=830152&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/shared/inst_agt.c (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/shared/inst_agt.c Tue Oct 27 12:39:55 2009
@@ -270,7 +270,7 @@
char* strlower(char * str){
char *temp = str;
- while(*temp = tolower(*temp))
+ while((*temp = tolower(*temp)))
temp++;
return str;
}
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/zipcache.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/zipcache.c?rev=830152&r1=830151&r2=830152&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/zipcache.c (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/hyzip/shared/zipcache.c Tue Oct 27 12:39:55 2009
@@ -469,7 +469,7 @@
if (zce->chunkActiveDir == dirEntry)
{
- if (entry = (HyZipFileEntry *) zipCache_reserveEntry (zce, chunk, sizeof (*entry), nameSize + 1))
+ if ((entry = (HyZipFileEntry *) zipCache_reserveEntry (zce, chunk, sizeof (*entry), nameSize + 1)))
{
/* add to end of existing entry */
zce->chunkActiveDir->fileList->entryCount++;
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/main_hlp.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/main_hlp.c?rev=830152&r1=830151&r2=830152&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/main_hlp.c (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/main_hlp.c Tue Oct 27 12:39:55 2009
@@ -345,9 +345,9 @@
{ /* empty path entry */
continue;
}
- if (sdir = opendir (temp))
+ if ((sdir = opendir (temp)))
{
- while (dirEntry = readdir (sdir))
+ while ((dirEntry = readdir (sdir)))
{
if (!strcmp (dirEntry->d_name, filename))
{