Mercurial > audlegacy

comparison src/audacious/tuple.c @ 3509:08085ecc7e91 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reverting stupidness.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 09 Sep 2007 07:14:00 +0300
parents 65502ec17b75
children b2a82a73a788
comparison
equal deleted inserted replaced
3508:6f67258c43fd 3509:08085ecc7e91
256 { 256 {
257 TupleValue *value; 257 TupleValue *value;
258 const gchar *tfield; 258 const gchar *tfield;
259 259
260 g_return_if_fail(tuple != NULL); 260 g_return_if_fail(tuple != NULL);
261 g_return_if_fail(nfield < FIELD_LAST && field == NULL); 261 g_return_if_fail(nfield < FIELD_LAST);
262 262
263 TUPLE_LOCK_WRITE(); 263 TUPLE_LOCK_WRITE();
264 if (nfield < 0) 264 if (nfield < 0)
265 tfield = field; 265 tfield = field;
266 else { 266 else {
288 tuple_get_value_type(Tuple *tuple, const gint nfield, const gchar *field) 288 tuple_get_value_type(Tuple *tuple, const gint nfield, const gchar *field)
289 { 289 {
290 TupleValueType type = TUPLE_UNKNOWN; 290 TupleValueType type = TUPLE_UNKNOWN;
291 291
292 g_return_val_if_fail(tuple != NULL, TUPLE_UNKNOWN); 292 g_return_val_if_fail(tuple != NULL, TUPLE_UNKNOWN);
293 g_return_val_if_fail(nfield < FIELD_LAST && field == NULL, TUPLE_UNKNOWN); 293 g_return_val_if_fail(nfield < FIELD_LAST, TUPLE_UNKNOWN);
294 294
295 TUPLE_LOCK_READ(); 295 TUPLE_LOCK_READ();
296 if (nfield < 0) { 296 if (nfield < 0) {
297 TupleValue *value; 297 TupleValue *value;
298 if ((value = mowgli_dictionary_retrieve(tuple->dict, field)) != NULL) 298 if ((value = mowgli_dictionary_retrieve(tuple->dict, field)) != NULL)
310 tuple_get_string(Tuple *tuple, const gint nfield, const gchar *field) 310 tuple_get_string(Tuple *tuple, const gint nfield, const gchar *field)
311 { 311 {
312 TupleValue *value; 312 TupleValue *value;
313 313
314 g_return_val_if_fail(tuple != NULL, NULL); 314 g_return_val_if_fail(tuple != NULL, NULL);
315 g_return_val_if_fail(nfield < FIELD_LAST && field == NULL, NULL); 315 g_return_val_if_fail(nfield < FIELD_LAST, NULL);
316 316
317 TUPLE_LOCK_READ(); 317 TUPLE_LOCK_READ();
318 if (nfield < 0) 318 if (nfield < 0)
319 value = mowgli_dictionary_retrieve(tuple->dict, field); 319 value = mowgli_dictionary_retrieve(tuple->dict, field);
320 else 320 else
336 tuple_get_int(Tuple *tuple, const gint nfield, const gchar *field) 336 tuple_get_int(Tuple *tuple, const gint nfield, const gchar *field)
337 { 337 {
338 TupleValue *value; 338 TupleValue *value;
339 339
340 g_return_val_if_fail(tuple != NULL, 0); 340 g_return_val_if_fail(tuple != NULL, 0);
341 g_return_val_if_fail(nfield < FIELD_LAST && field == NULL, 0); 341 g_return_val_if_fail(nfield < FIELD_LAST, 0);
342 342
343 TUPLE_LOCK_READ(); 343 TUPLE_LOCK_READ();
344 if (nfield < 0) 344 if (nfield < 0)
345 value = mowgli_dictionary_retrieve(tuple->dict, field); 345 value = mowgli_dictionary_retrieve(tuple->dict, field);
346 else 346 else