Revision: 7055 http://playerstage.svn.sourceforge.net/playerstage/?rev=7055&view=rev Author: thjc Date: 2008-09-30 21:52:04 +0000 (Tue, 30 Sep 2008)
Log Message: ----------- fixed warning in a print statement and a mistaken bit wise operator instead of boolean Modified Paths: -------------- code/stage/branches/release-2-1-patches/src/model_bumper.c code/stage/branches/release-2-1-patches/src/model_laser.c Modified: code/stage/branches/release-2-1-patches/src/model_bumper.c =================================================================== --- code/stage/branches/release-2-1-patches/src/model_bumper.c 2008-09-30 17:07:00 UTC (rev 7054) +++ code/stage/branches/release-2-1-patches/src/model_bumper.c 2008-09-30 21:52:04 UTC (rev 7055) @@ -303,8 +303,8 @@ } else if( dlen > 0 ) - PRINT_WARN2( "data size doesn't match configuation (%d/%d bytes)", - (int)dlen, (int)rcount * sizeof(stg_bumper_sample_t) ); + PRINT_WARN2( "data size doesn't match configuation (%l/%l bytes)", + (int)dlen, (int)(rcount * sizeof(stg_bumper_sample_t) )); return 0; // keep running } Modified: code/stage/branches/release-2-1-patches/src/model_laser.c =================================================================== --- code/stage/branches/release-2-1-patches/src/model_laser.c 2008-09-30 17:07:00 UTC (rev 7054) +++ code/stage/branches/release-2-1-patches/src/model_laser.c 2008-09-30 21:52:04 UTC (rev 7055) @@ -355,7 +355,7 @@ size_t sample_count = mod->data_len / sizeof(stg_laser_sample_t); stg_laser_config_t *cfg = (stg_laser_config_t*)mod->cfg; - if( samples == NULL | sample_count < 1 ) + if( samples == NULL || sample_count < 1 ) return 0; assert( cfg ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ Playerstage-commit mailing list Playerstage-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/playerstage-commit