Changeset 5171:7c5491b0c607 in roaraudio
- Timestamp:
- 10/22/11 00:39:19 (13 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libroardsp/filter.c
r4708 r5171 77 77 } 78 78 79 roar_err_set(ROAR_ERROR_NOENT); 79 80 return -1; 80 81 } … … 89 90 } 90 91 92 roar_err_set(ROAR_ERROR_NOENT); 91 93 return NULL; 92 94 } … … 95 97 struct roardsp_filter * n; 96 98 int ret; 97 98 if ( filter == NULL || stream == NULL ) 99 return -1; 99 int error; 100 101 if ( filter == NULL || stream == NULL ) { 102 roar_err_set(ROAR_ERROR_FAULT); 103 return -1; 104 } 100 105 101 106 *filter = NULL; // just to be sure … … 107 112 108 113 if ( (ret = roardsp_filter_init(n, stream, id)) == -1 ) { 114 error = roar_error; 109 115 roar_mm_free(n); 116 roar_err_set(error); 110 117 return -1; 111 118 } … … 125 132 if ( filter == NULL || stream == NULL ) { 126 133 ROAR_DBG("roardsp_filter_init(*) = -1 // filter or stream is NULL"); 134 roar_err_set(ROAR_ERROR_FAULT); 135 return -1; 136 } 137 138 if ( id < 0 ) { 139 roar_err_set(ROAR_ERROR_INVAL); 127 140 return -1; 128 141 } … … 139 152 140 153 while ( l->id != id ) { 141 if ( l->id == -1 ) 154 if ( l->id == -1 ) { 155 roar_err_set(ROAR_ERROR_NOENT); 142 156 return -1; 157 } 143 158 l++; 144 159 } … … 156 171 if ( calc == NULL ) { 157 172 ROAR_DBG("roardsp_filter_init(*) = -1 // no calc code"); 173 roar_err_set(ROAR_ERROR_NOTSUP); 158 174 return -1; 159 175 } … … 173 189 int ret = 0; 174 190 175 if ( filter == NULL ) 176 return -1; 191 if ( filter == NULL ) { 192 roar_err_set(ROAR_ERROR_FAULT); 193 return -1; 194 } 177 195 178 196 if ( filter->uninit != NULL ) … … 191 209 int ret = 0; 192 210 193 if ( filter == NULL ) 194 return -1; 195 196 if ( data == NULL && len != 0 ) 197 return -1; 211 if ( filter == NULL ) { 212 roar_err_set(ROAR_ERROR_FAULT); 213 return -1; 214 } 215 216 if ( data == NULL && len != 0 ) { 217 roar_err_set(ROAR_ERROR_FAULT); 218 return -1; 219 } 198 220 199 221 if ( filter->calc != NULL ) … … 204 226 205 227 int roardsp_filter_ctl (struct roardsp_filter * filter, int cmd, void * data) { 206 if ( filter == NULL ) 207 return -1; 228 if ( filter == NULL ) { 229 roar_err_set(ROAR_ERROR_FAULT); 230 return -1; 231 } 208 232 209 233 if ( filter->ctl != NULL ) 210 234 return filter->ctl(filter, cmd, data); 211 235 236 roar_err_set(ROAR_ERROR_NOSYS); 212 237 return -1; 213 238 } 214 239 215 240 int roardsp_filter_reset (struct roardsp_filter * filter, int what) { 216 if ( filter == NULL ) 217 return -1; 241 if ( filter == NULL ) { 242 roar_err_set(ROAR_ERROR_FAULT); 243 return -1; 244 } 218 245 219 246 if ( filter->reset != NULL ) 220 247 return filter->reset(filter, what); 221 248 249 roar_err_set(ROAR_ERROR_NOSYS); 222 250 return -1; 223 251 }
Note: See TracChangeset
for help on using the changeset viewer.