From c66f8ee33a3558962ee7da908aa000fbc1112b98 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Thu, 7 Jun 2012 11:14:35 +0000 Subject: [PATCH] Eo: Clean up previous commit a bit. SVN revision: 71799 --- legacy/eobj/lib/eo.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/legacy/eobj/lib/eo.c b/legacy/eobj/lib/eo.c index d16d55c603..621efec586 100644 --- a/legacy/eobj/lib/eo.c +++ b/legacy/eobj/lib/eo.c @@ -762,15 +762,10 @@ eo_class_funcs_set(Eo_Class *klass, const Eo_Op_Func_Description *func_descs) } else { - Eo_Op_Type desc_type = EO_OP_TYPE_REGULAR; - const char *desc_name = NULL; - if (op_desc) - { - desc_type = op_desc->op_type; - desc_name = op_desc->name; - } - - ERR("Set function's op type (%d) is different than the one in the op description (%d) for op '%s' in class '%s'.", itr->op_type, desc_type, desc_name, klass->desc->name); + ERR("Set function's op type (%d) is different than the one in the op description (%d) for op '%s' in class '%s'.", itr->op_type, + (op_desc) ? op_desc->op_type : EO_OP_TYPE_REGULAR, + (op_desc) ? op_desc->name : NULL, + klass->desc->name); } } }