Changeset 7013eb9 for functions.c
- Timestamp:
- Jan 5, 2011, 1:35:52 PM (13 years ago)
- Branches:
- release-1.7
- Children:
- 4976e93
- Parents:
- 2e5b2f9
- git-author:
- David Benjamin <davidben@mit.edu> (01/02/11 19:37:28)
- git-committer:
- David Benjamin <davidben@mit.edu> (01/05/11 13:35:52)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
functions.c
rf85278b r7013eb9 2280 2280 /* Create a filter for a class, instance if one doesn't exist. If 2281 2281 * instance is NULL then catch all messgaes in the class. Returns the 2282 * name of the filter , which the caller must free.2282 * name of the filter or null. The caller must free this name. 2283 2283 * If 'related' is nonzero, encompass unclasses and .d classes as well. 2284 2284 */ … … 2348 2348 2349 2349 f = owl_filter_new_fromstring(filtname, argbuff); 2350 owl_free(argbuff); 2351 if (f == NULL) { 2352 /* Couldn't make a filter for some reason. Return NULL. */ 2353 owl_function_error("Error creating filter '%s'", filtname); 2354 owl_free(filtname); 2355 filtname = NULL; 2356 goto done; 2357 } 2350 2358 2351 2359 /* add it to the global list */ 2352 2360 owl_global_add_filter(&g, f); 2353 2361 2354 owl_free(argbuff);2355 2362 done: 2356 2363 owl_free(class); … … 2390 2397 "recipient ^%1$s$ ) ) ) or ( ( class ^login$ ) and ( sender ^%1$s$ ) )", 2391 2398 esclonguser); 2399 owl_free(esclonguser); 2392 2400 2393 2401 f = owl_filter_new_fromstring(filtname, argbuff); 2402 owl_free(argbuff); 2403 2404 if (f == NULL) { 2405 /* Couldn't make a filter for some reason. Return NULL. */ 2406 owl_function_error("Error creating filter '%s'", filtname); 2407 owl_free(filtname); 2408 return NULL; 2409 } 2394 2410 2395 2411 /* add it to the global list */ 2396 2412 owl_global_add_filter(&g, f); 2397 2398 /* free stuff */2399 owl_free(argbuff);2400 owl_free(esclonguser);2401 2413 2402 2414 return(filtname); … … 2430 2442 "( sender ^%2$s$ and recipient ^%1$s$ ) ) )", 2431 2443 escuser, owl_global_get_aim_screenname_for_filters(&g)); 2444 owl_free(escuser); 2432 2445 2433 2446 f = owl_filter_new_fromstring(filtname, argbuff); 2447 owl_free(argbuff); 2448 2449 if (f == NULL) { 2450 owl_function_error("Error creating filter '%s'", filtname); 2451 owl_free(filtname); 2452 return NULL; 2453 } 2434 2454 2435 2455 /* add it to the global list */ 2436 2456 owl_global_add_filter(&g, f); 2437 2438 /* free stuff */2439 owl_free(argbuff);2440 owl_free(escuser);2441 2457 2442 2458 return(filtname); … … 2460 2476 2461 2477 argbuff = owl_sprintf("type ^%s$", esctype); 2478 owl_free(esctype); 2462 2479 2463 2480 f = owl_filter_new_fromstring(filtname, argbuff); 2481 owl_free(argbuff); 2482 2483 if (f == NULL) { 2484 owl_function_error("Error creating filter '%s'", filtname); 2485 owl_free(filtname); 2486 return NULL; 2487 } 2464 2488 2465 2489 /* add it to the global list */ 2466 2490 owl_global_add_filter(&g, f); 2467 2468 /* free stuff */2469 owl_free(argbuff);2470 owl_free(esctype);2471 2491 2472 2492 return filtname; … … 2520 2540 f = owl_filter_new_fromstring(filtname, buf->str); 2521 2541 g_string_free(buf, true); 2542 2543 if (f == NULL) { 2544 owl_function_error("Error creating filter '%s'", filtname); 2545 owl_free(filtname); 2546 return NULL; 2547 } 2522 2548 2523 2549 owl_global_add_filter(&g, f);
Note: See TracChangeset
for help on using the changeset viewer.