You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2011/07/29 02:55:30 UTC
[lucy-commits] svn commit: r1152065 - /incubator/lucy/trunk/clownfish/src/CFCPerlMethod.c
Author: marvin
Date: Fri Jul 29 00:55:29 2011
New Revision: 1152065
URL: http://svn.apache.org/viewvc?rev=1152065&view=rev
Log:
Minor cleanup of exception generating code.
Modified:
incubator/lucy/trunk/clownfish/src/CFCPerlMethod.c
Modified: incubator/lucy/trunk/clownfish/src/CFCPerlMethod.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCPerlMethod.c?rev=1152065&r1=1152064&r2=1152065&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCPerlMethod.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCPerlMethod.c Fri Jul 29 00:55:29 2011
@@ -180,7 +180,7 @@ S_xsub_def_labeled_params(CFCPerlMethod
"XS(%s) {\n"
" dXSARGS;\n"
" CHY_UNUSED_VAR(cv);\n"
- " if (items < 1) { CFISH_THROW(CFISH_ERR, \"Usage: %%s(%%s)\", GvNAME(CvGV(cv)), \"%s, ...\"); };\n"
+ " if (items < 1) { CFISH_THROW(CFISH_ERR, \"Usage: %%s(%s, ...)\", GvNAME(CvGV(cv))); };\n"
" SP -= items;\n"
"\n"
" /* Extract vars from Perl stack. */\n"
@@ -237,8 +237,7 @@ S_xsub_def_positional_args(CFCPerlMethod
}
}
const char num_args_pattern[] =
- "if (items %s %u) { CFISH_THROW(CFISH_ERR, \"Usage: %%s(%%s)\", "
- "GvNAME(CvGV(cv)), \"%s\"); }";
+ "if (items %s %u) { CFISH_THROW(CFISH_ERR, \"Usage: %%s(%s)\", GvNAME(CvGV(cv))); }";
size_t num_args_check_size = sizeof(num_args_pattern)
+ strlen(xs_name_list)
+ 30;
@@ -248,7 +247,7 @@ S_xsub_def_positional_args(CFCPerlMethod
xs_name_list);
}
else {
- sprintf(num_args_check, num_args_pattern, "!=", min_required,
+ sprintf(num_args_check, num_args_pattern, "!=", num_vars,
xs_name_list);
}