Browse Source

cmTimeLine.c,cmAudioPort.c,cmPgmOpts.c,cmProc.c,cmRtSys.c:

Changes to remove compiler warnings on OSX build.
master
kevin 11 years ago
parent
commit
efd54c7657
5 changed files with 32 additions and 18 deletions
  1. 3
    3
      app/cmTimeLine.c
  2. 12
    8
      cmAudioPort.c
  3. 9
    3
      cmPgmOpts.c
  4. 5
    3
      cmProc4.c
  5. 3
    1
      cmRtSys.c

+ 3
- 3
app/cmTimeLine.c View File

@@ -271,9 +271,9 @@ _cmTlObj_t* _cmTlFindRecdBefore( _cmTl_t* p, const _cmTlObj_t* np )
271 271
 
272 272
   // calc the absolute time of this object
273 273
   //int         absSmpIdx = _cmTlStartTime(np->obj);
274
-  int         rsi;
275
-  _cmTlObj_t* rp        = NULL;
276
-  _cmTlObj_t* op        = p->seq[np->obj->seqId].first;
274
+  int         rsi = 0;
275
+  _cmTlObj_t* rp  = NULL;
276
+  _cmTlObj_t* op  = p->seq[np->obj->seqId].first;
277 277
 
278 278
   //printf("type:%i %i\n",np->obj->typeId,absSmpIdx);
279 279
 

+ 12
- 8
cmAudioPort.c View File

@@ -51,6 +51,10 @@ cmAp_t* _ap = NULL;
51 51
 
52 52
 cmApRC_t      _cmApIndexToDev( unsigned devIdx, cmApDriver_t** drvPtrPtr, unsigned* devIdxPtr )
53 53
 {
54
+  assert( drvPtrPtr != NULL && devIdxPtr != NULL );
55
+  *drvPtrPtr = NULL;
56
+  *devIdxPtr = cmInvalidIdx;
57
+
54 58
   unsigned i;
55 59
   for(i=0; i<_ap->drvCnt; ++i)
56 60
     if( _ap->drvArray[i].begDevIdx != cmInvalidIdx )
@@ -204,8 +208,8 @@ unsigned cmApDeviceCount()
204 208
 
205 209
 const char*   cmApDeviceLabel( unsigned devIdx )
206 210
 {
207
-  cmApDriver_t* dp;
208
-  unsigned      di;
211
+  cmApDriver_t* dp = NULL;
212
+  unsigned      di = cmInvalidIdx;
209 213
   cmApRC_t      rc;
210 214
 
211 215
   if( devIdx == cmInvalidIdx )
@@ -233,8 +237,8 @@ unsigned      cmApDeviceLabelToIndex( const cmChar_t* label )
233 237
 
234 238
 unsigned      cmApDeviceChannelCount(   unsigned devIdx, bool inputFl )
235 239
 {
236
-  cmApDriver_t* dp;
237
-  unsigned      di;
240
+  cmApDriver_t* dp = NULL;
241
+  unsigned      di = cmInvalidIdx;
238 242
   cmApRC_t      rc;
239 243
 
240 244
   if( devIdx == cmInvalidIdx )
@@ -248,8 +252,8 @@ unsigned      cmApDeviceChannelCount(   unsigned devIdx, bool inputFl )
248 252
 
249 253
 double        cmApDeviceSampleRate(     unsigned devIdx )
250 254
 {
251
-  cmApDriver_t* dp;
252
-  unsigned      di;
255
+  cmApDriver_t* dp = NULL;
256
+  unsigned      di = cmInvalidIdx;
253 257
   cmApRC_t      rc;
254 258
 
255 259
   if((rc = _cmApIndexToDev(devIdx,&dp,&di)) != kOkApRC )
@@ -260,8 +264,8 @@ double        cmApDeviceSampleRate(     unsigned devIdx )
260 264
 
261 265
 unsigned      cmApDeviceFramesPerCycle( unsigned devIdx, bool inputFl )
262 266
 {
263
-  cmApDriver_t* dp;
264
-  unsigned      di;
267
+  cmApDriver_t* dp = NULL;
268
+  unsigned      di = cmInvalidIdx;
265 269
   cmApRC_t      rc;
266 270
 
267 271
   if( devIdx == cmInvalidIdx )

+ 9
- 3
cmPgmOpts.c View File

@@ -856,6 +856,9 @@ cmPoRC_t  _cmPgmOptIndexToPtr( _cmPo_t* p, unsigned idx, const _cmPoArg_t** app
856 856
   unsigned          n = 0;
857 857
   const _cmPoArg_t* a = p->args;
858 858
 
859
+  assert(app != NULL );
860
+  *app = NULL;
861
+
859 862
   while( a != NULL && n < idx )
860 863
   {
861 864
     ++n;
@@ -872,28 +875,31 @@ cmPoRC_t  _cmPgmOptIndexToPtr( _cmPo_t* p, unsigned idx, const _cmPoArg_t** app
872 875
   
873 876
 unsigned cmPgmOptNumId( cmPgmOptH_t h, unsigned argIdx )
874 877
 {
875
-  const _cmPoArg_t* a;
878
+  const _cmPoArg_t* a = NULL;
876 879
   cmPoRC_t          rc;
877 880
   if((rc = _cmPgmOptIndexToPtr(_cmPoHandleToPtr(h),argIdx,&a)) != kOkPoRC )
878 881
     return cmInvalidId;
882
+  assert( a != NULL );
879 883
   return a->opt->numId;
880 884
 }
881 885
 
882 886
 unsigned cmPgmOptCharId( cmPgmOptH_t h, unsigned argIdx )
883 887
 {
884
-  const _cmPoArg_t* a;
888
+  const _cmPoArg_t* a = NULL;
885 889
   cmPoRC_t          rc;
886 890
   if((rc = _cmPgmOptIndexToPtr(_cmPoHandleToPtr(h),argIdx,&a)) != kOkPoRC )
887 891
     return cmInvalidId;
892
+  assert(a != NULL );
888 893
   return a->opt->charId;
889 894
 }
890 895
 
891 896
 const cmChar_t* cmPgmOptWordId( cmPgmOptH_t h, unsigned argIdx )
892 897
 {
893
-  const _cmPoArg_t* a;
898
+  const _cmPoArg_t* a = NULL;
894 899
   cmPoRC_t          rc;
895 900
   if((rc = _cmPgmOptIndexToPtr(_cmPoHandleToPtr(h),argIdx,&a)) != kOkPoRC )
896 901
     return NULL;
902
+  assert(a!=NULL);
897 903
   return a->opt->wordId;
898 904
 }
899 905
 

+ 5
- 3
cmProc4.c View File

@@ -2437,8 +2437,8 @@ void cmScMatcherPrint( cmScMatcher* p )
2437 2437
     // if this result did not match a score event
2438 2438
     if( cmIsFlag(rp->flags,kSmFalsePosFl) )
2439 2439
     {
2440
-      unsigned            d_min;
2441
-      cmScMatcherPrint_t* dp = NULL;
2440
+      unsigned            d_min    = 0;
2441
+      cmScMatcherPrint_t* dp       = NULL;
2442 2442
       unsigned            scLocIdx = cmInvalidIdx;
2443 2443
 
2444 2444
       // if this result does not have a valid locIdx 
@@ -3942,6 +3942,8 @@ cmRC_t  _cmScModGetParam( cmScModulator* p, const cmScModParam_t* pp, double* va
3942 3942
   switch( pp->pid )
3943 3943
   {
3944 3944
     case kInvalidModPId:
3945
+      rc  = cmCtxRtCondition( &p->obj, cmInvalidArgRC, "An invalid parameter was encountered.");
3946
+      goto errLabel;
3945 3947
       break;
3946 3948
 
3947 3949
     case kLiteralModPId:
@@ -4059,7 +4061,7 @@ bool  _cmScModExec( cmScModulator* p, cmScModVar_t* vp )
4059 4061
     case kSetLineModTId:
4060 4062
     case kLineModTId:
4061 4063
       {
4062
-        double v1, td;
4064
+        double v1=0, td=0;
4063 4065
 
4064 4066
         // get the target value
4065 4067
         if((rc = _cmScModGetParam(p,&vp->entry->end,&v1)) != cmOkRC) 

+ 3
- 1
cmRtSys.c View File

@@ -1464,7 +1464,9 @@ void cmRtSysTest( cmCtx_t* ctx, int argc, const char* argv[] )
1464 1464
   cmRtSysStatus_t status;
1465 1465
   _cmRtTestCbRecd    cbRecd = {1000.0,0,48000.0,0};
1466 1466
   cmRpt_t* rpt = &ctx->rpt;
1467
-  
1467
+  memset(&status,0,sizeof(status));
1468
+
1469
+
1468 1470
   unsigned meterMs = 50;
1469 1471
   unsigned ssCnt = 1;
1470 1472
   unsigned rtSubIdx = 0;

Loading…
Cancel
Save