diff --git a/src/builtin_functions.c b/src/builtin_functions.c
index 8b624a30cd1e10c65add61aacf3aba0cdc1dfd9e..525e8ecec8b65dc6e87b868b36bcdb8b5a2aac0c 100644
--- a/src/builtin_functions.c
+++ b/src/builtin_functions.c
@@ -6563,7 +6563,7 @@ static void f_longest_ordered_sequence(INT32 args)
struct array *a = NULL;
struct array *aa = NULL;
- get_all_args("Array.longest_ordered_sequence", args, "%a", &a);
+ get_all_args("longest_ordered_sequence", args, "%a", &a);
/* THREADS_ALLOW(); */
@@ -6572,7 +6572,7 @@ static void f_longest_ordered_sequence(INT32 args)
/* THREADS_DISALLOW(); */
if (!aa) {
- SIMPLE_OUT_OF_MEMORY_ERROR("Array.longest_ordered_sequence",
+ SIMPLE_OUT_OF_MEMORY_ERROR("longest_ordered_sequence",
(int)sizeof(int *)*a->size*2);
}
diff --git a/src/error.c b/src/error.c
index 7828ed8ff43cbc67179e9f989edac412ca70d943..9f4925d538ee1b62b7f86c197e85fe6980b2f7b7 100644
--- a/src/error.c
+++ b/src/error.c
@@ -625,7 +625,7 @@ PMOD_EXPORT DECLSPEC(noreturn) void debug_fatal(const char *fmt, ...) ATTRIBUTE(
*/
static void f_error_cast(INT32 args)
{
- if(Pike_sp[-1].u.string == literal_array_string)
+ if(Pike_sp[-args].u.string == literal_array_string)
{
pop_stack();
apply_current (generic_err_message_fun, 0);
@@ -660,7 +660,7 @@ static void f_error_cast(INT32 args)
static void f_error_index(INT32 args)
{
INT_TYPE ind;
- get_all_args("error->`[]",args,"%i",&ind);
+ get_all_args("`[]",args,"%i",&ind);
switch(ind)
{
@@ -673,7 +673,7 @@ static void f_error_index(INT32 args)
apply_current (generic_err_backtrace_fun, 0);
break;
default:
- index_error("error->`[]", Pike_sp-args, args, NULL, Pike_sp-args,
+ index_error("`[]", Pike_sp-args, args, NULL, Pike_sp-args,
"Index %"PRINTPIKEINT"d is out of range 0..1.\n", ind);
break;
}
diff --git a/src/modules/CommonLog/clf.c b/src/modules/CommonLog/clf.c
index 06c69397326e2cf5fd20661948349f3f6fe7ab41..e535ba9af4e1301cb83e4e2761f4c5dd8c00aeaa 100644
--- a/src/modules/CommonLog/clf.c
+++ b/src/modules/CommonLog/clf.c
@@ -173,16 +173,16 @@ static void f_read( INT32 args )
}
old_sp = sp;
- get_all_args("CommonLog.read", args, "%*%*", &logfun, &file);
+ get_all_args("read", args, "%*%*", &logfun, &file);
if(TYPEOF(*logfun) != T_FUNCTION)
- SIMPLE_BAD_ARG_ERROR("CommonLog.read", 1, "function");
+ SIMPLE_BAD_ARG_ERROR("read", 1, "function");
if(TYPEOF(*file) == T_OBJECT)
{
f = fd_from_object(file->u.object);
if(f == -1)
- Pike_error("CommonLog.read: File is not open.\n");
+ Pike_error("File is not open.\n");
my_fd = 0;
} else if(TYPEOF(*file) == T_STRING &&
file->u.string->size_shift == 0) {
@@ -205,7 +205,7 @@ static void f_read( INT32 args )
{
case 0: /* return 0 */
errno=EPERM;
- Pike_error("CommonLog.read(): Failed to open file for reading (errno=%d).\n",
+ Pike_error("Failed to open file for reading (errno=%d).\n",
errno);
case 2: /* ok */
@@ -213,7 +213,7 @@ static void f_read( INT32 args )
break;
case 3: /* permission denied */
- Pike_error("CommonLog.read: permission denied.\n");
+ Pike_error("permission denied.\n");
default:
Pike_error("Error in user->valid_open, wrong return value.\n");
@@ -221,8 +221,10 @@ static void f_read( INT32 args )
break;
default:
+#ifdef PIKE_DEBUG
Pike_error("Error in user->valid_open, wrong return type.\n");
-
+#endif
+ /* Fallthrough */
case PIKE_T_STRING:
/* if(Pike_sp[-1].u.string->shift_size) */
/* file=Pike_sp[-1]; */
@@ -240,10 +242,10 @@ static void f_read( INT32 args )
} while (1);
if(f < 0)
- Pike_error("CommonLog.read(): Failed to open file for reading (errno=%d).\n",
- errno);
+ Pike_error("Failed to open file for reading (errno=%d).\n",
+ errno);
} else
- SIMPLE_BAD_ARG_ERROR("CommonLog.read", 2, "string|Stdio.File");
+ SIMPLE_BAD_ARG_ERROR("read", 2, "string|Stdio.File");
#ifdef HAVE_LSEEK64
lseek64(f, offs0, SEEK_SET);
diff --git a/src/modules/Gettext/gettext.c b/src/modules/Gettext/gettext.c
index 5a18c986c131018332d521a42feb7c13ed78b5c2..ae3039ae23e9a89d52ab05c88fec813e6f939e08 100644
--- a/src/modules/Gettext/gettext.c
+++ b/src/modules/Gettext/gettext.c
@@ -77,7 +77,7 @@ void f_gettext(INT32 args)
const char *domain = NULL, *msg;
int cat = 0;
- get_all_args("Locale.Gettext.gettext", args, "%c.%C%D", &msg, &domain, &cat);
+ get_all_args("gettext", args, "%c.%C%D", &msg, &domain, &cat);
if (domain) {
if (args > 2 && SUBTYPEOF(Pike_sp[2-args]) == NUMBER_NUMBER)
@@ -106,7 +106,7 @@ void f_gettext(INT32 args)
void f_dgettext(INT32 args)
{
const char *domain, *msg;
- get_all_args("Locale.Gettext.dgettext", args, "%c%c", &domain, &msg);
+ get_all_args("dgettext", args, "%c%c", &domain, &msg);
push_text(dgettext(domain, msg));
@@ -133,8 +133,7 @@ void f_dcgettext(INT32 args)
const char *domain, *msg;
int category;
- get_all_args("Locale.Gettext.dcgettext", args, "%c%c%d",
- &domain, &msg, &category);
+ get_all_args("dcgettext", args, "%c%c%d", &domain, &msg, &category);
push_text(dcgettext(domain, msg, category));
@@ -171,7 +170,7 @@ void f_textdomain(INT32 args)
{
const char *domain = NULL;
char *returnstring;
- get_all_args ("Locale.Gettext.textdomain", args, ".%C", &domain);
+ get_all_args ("textdomain", args, ".%C", &domain);
returnstring = textdomain(domain);
pop_n_elems(args);
push_text(returnstring);
@@ -212,8 +211,7 @@ void f_bindtextdomain(INT32 args)
{
char *returnstring;
const char *domain = NULL, *dirname = NULL;
- get_all_args ("Locale.Gettext.bindtextdomain", args,
- ".%C%C", &domain, &dirname);
+ get_all_args ("bindtextdomain", args, ".%C%C", &domain, &dirname);
if (!domain || !*domain)
returnstring = NULL;
@@ -262,7 +260,7 @@ void f_setlocale(INT32 args)
char *returnstring;
const char *locale;
int category;
- get_all_args("Locale.Gettext.setlocale", args, "%d%c", &category, &locale);
+ get_all_args("setlocale", args, "%d%c", &category, &locale);
returnstring = setlocale(category, locale);
pop_n_elems(args);
diff --git a/src/modules/Image/colors.c b/src/modules/Image/colors.c
index 90b763876632d478a352db4f774db8b5129fc2fd..fc6aa8d1894eae2ddce2f9a086cd43654770c0dd 100644
--- a/src/modules/Image/colors.c
+++ b/src/modules/Image/colors.c
@@ -458,7 +458,7 @@ static void image_color_greylevel(INT32 args)
}
else
{
- get_all_args("Image.Color.Color->greylevel()",args,"%i%i%i",&r,&g,&b);
+ get_all_args("greylevel",args,"%i%i%i",&r,&g,&b);
}
pop_n_elems(args);
if (r+g+b==0) r=g=b=1;
@@ -657,7 +657,7 @@ static void image_color_hex(INT32 args)
INT_TYPE i=sizeof(COLORTYPE)*2;
if (args)
- get_all_args("Image.Color.Color->hex()",args,"%i",&i);
+ get_all_args("hex",args,"%i",&i);
pop_n_elems(args);
if (i<1)
@@ -1165,7 +1165,7 @@ static void image_color_bright(INT32 args)
static void image_color_mult(INT32 args)
{
FLOAT_TYPE x=0.0;
- get_all_args("Image.Color.Color->`*",args,"%f",&x);
+ get_all_args("`*",args,"%f",&x);
pop_n_elems(args);
_image_make_rgb_color(DOUBLE_TO_INT(THIS->rgb.r*x),
DOUBLE_TO_INT(THIS->rgb.g*x),
@@ -1334,7 +1334,7 @@ static void image_get_color(INT32 args)
sp--;
dmalloc_touch_svalue(sp);
push_array_items(sp->u.array);
- get_all_args("Image.Color()",3,"%f%f%f",&h,&s,&v);
+ get_all_args("create",3,"%f%f%f",&h,&s,&v);
pop_n_elems(3);
push_int(DOUBLE_TO_INT(h/360.0*256.0));
push_int(DOUBLE_TO_INT(s/100.0*255.4));
@@ -1568,7 +1568,7 @@ static void image_make_rgb_color(INT32 args)
r &= 0xff;
}
else
- get_all_args("Image.Color.rgb()",args,"%i%i%i",&r,&g,&b);
+ get_all_args("rgb",args,"%i%i%i",&r,&g,&b);
_image_make_rgb_color(r,g,b);
}
@@ -1581,8 +1581,7 @@ static void image_make_hsv_color(INT32 args)
if (args && TYPEOF(sp[-args]) == T_INT)
{
INT_TYPE hi,si,vi;
- get_all_args("Image.Color.hsv()",args,"%i%i%i",
- &hi,&si,&vi);
+ get_all_args("hsv",args,"%i%i%i",&hi,&si,&vi);
pop_n_elems(args);
if (hi<0) hi=(hi%COLORMAX)+COLORMAX;
@@ -1596,8 +1595,7 @@ static void image_make_hsv_color(INT32 args)
}
else
{
- get_all_args("Image.Color.hsv()",args,"%f%f%f",
- &h,&s,&v);
+ get_all_args("hsv",args,"%f%f%f",&h,&s,&v);
pop_n_elems(args);
if (h<0) h = 360 + h - ((DOUBLE_TO_INT(h)/360)*360);
if (h>360.0) h -= ((DOUBLE_TO_INT(h)/360)*360);
@@ -1639,7 +1637,7 @@ static void image_make_hsv_color(INT32 args)
static void image_make_cmyk_color(INT32 args)
{
FLOAT_TYPE c,m,y,k,r,g,b;
- get_all_args("Image.Color.cmyk()",args,"%F%F%F%F",&c,&m,&y,&k);
+ get_all_args("cmyk",args,"%F%F%F%F",&c,&m,&y,&k);
pop_n_elems(args);
r=100-(c+k);
@@ -1653,7 +1651,7 @@ static void image_make_greylevel_color(INT32 args)
{
INT_TYPE i;
- get_all_args("Image.Color.greylevel()",args,"%i",&i);
+ get_all_args("greylevel",args,"%i",&i);
pop_n_elems(args);
_image_make_rgb_color(i,i,i);
diff --git a/src/modules/Image/colortable.c b/src/modules/Image/colortable.c
index a499336d5697f6659db00ca9603406db6a20e1d4..149a7528329e09e86b0b3e5b92faead933944523 100644
--- a/src/modules/Image/colortable.c
+++ b/src/modules/Image/colortable.c
@@ -2810,7 +2810,7 @@ void image_colortable_rigid(INT32 args)
if (args)
{
- get_all_args("Image.Colortable->rigid()",args,"%i%i%i",&r,&g,&b);
+ get_all_args("rigid",args,"%i%i%i",&r,&g,&b);
}
else
{
diff --git a/src/modules/Image/encodings/pcx.c b/src/modules/Image/encodings/pcx.c
index c81982584e1aaf62e0a637e76ed42cbebb6b7c99..4eacb92c3fef6e023da3b7c4b2c58aaaa40e8077 100644
--- a/src/modules/Image/encodings/pcx.c
+++ b/src/modules/Image/encodings/pcx.c
@@ -343,7 +343,7 @@ void image_pcx_decode( INT32 args )
{
struct pike_string *data;
struct object *o;
- get_all_args( "Image.PCX.decode", args, "%S", &data );
+ get_all_args( "decode", args, "%S", &data );
o = low_pcx_decode( data );
pop_n_elems(args);
push_object( o );
@@ -577,7 +577,7 @@ void image_pcx_encode( INT32 args )
struct object *i;
struct image *img;
- get_all_args( "Image.PCX.encode", args, "%o", &i );
+ get_all_args( "encode", args, "%o", &i );
if(TYPEOF(Pike_sp[-1]) != PIKE_T_OBJECT)
Pike_error("Invalid object argument to Image.PCX.encode\n");
diff --git a/src/modules/Image/encodings/psd.c b/src/modules/Image/encodings/psd.c
index 1cbe4819f7cbdf7af8a7bec00afca86fd598497f..c62a5fa646b49d9ad58447e26f267a01b11aa9fc 100644
--- a/src/modules/Image/encodings/psd.c
+++ b/src/modules/Image/encodings/psd.c
@@ -743,7 +743,7 @@ static void image_f_psd___decode( INT32 args )
{
struct pike_string *s;
struct buffer b;
- get_all_args( "Image.PSD.___decode", args, "%S", &s );
+ get_all_args( "___decode", args, "%S", &s );
if(args > 1)
pop_n_elems( args-1 );
if(s->len < 26+4+4+4 ) /* header+color mode+image res+layers */
diff --git a/src/modules/Image/encodings/pvr.c b/src/modules/Image/encodings/pvr.c
index ceb84969b3e9edfbd0a2a16f278e47db441629cc..a017a82e443de8283e0c15b2a375ba6c8a1d1e26 100644
--- a/src/modules/Image/encodings/pvr.c
+++ b/src/modules/Image/encodings/pvr.c
@@ -583,8 +583,8 @@ void image_pvr_f_encode(INT32 args)
unsigned char *dst;
struct gla_state *gla_st = NULL;
- get_all_args("Image.PVR.encode", args, (args>1 && !UNSAFE_IS_ZERO(&sp[1-args])?
- "%o%m":"%o"), &imgo, &optm);
+ get_all_args("encode", args, (args>1 && !UNSAFE_IS_ZERO(&sp[1-args])?
+ "%o%m":"%o"), &imgo, &optm);
if((img=get_storage(imgo, image_program))==NULL)
Pike_error("Image.PVR.encode: illegal argument 1\n");
@@ -1037,7 +1037,7 @@ void img_pvr_decode(INT32 args,int header_only)
INT32 attr;
unsigned int h, w, x;
- get_all_args("Image.PVR._decode", args, "%S", &str);
+ get_all_args("_decode", args, "%S", &str);
s = (unsigned char *)str->str;
len = str->len;
pop_n_elems(args-1);
diff --git a/src/modules/Image/encodings/ras.c b/src/modules/Image/encodings/ras.c
index 9fd36a1d7fad03782a60539a389fe5351b3b1116..8d0c1b7f2c6be82507ffb2e32f790d29f1abeea1 100644
--- a/src/modules/Image/encodings/ras.c
+++ b/src/modules/Image/encodings/ras.c
@@ -146,7 +146,7 @@ void img_ras_decode(INT32 args)
size_t numcolors = 0;
struct nct_flat_entry *entries = NULL;
- get_all_args("Image.RAS.decode", args, "%S", &str);
+ get_all_args("decode", args, "%S", &str);
if(str->len < 32)
Pike_error("Image.RAS.decode: header too small\n");
@@ -441,7 +441,7 @@ static void img_ras_encode(INT32 args)
void (*ctfunc)(rgb_group *, unsigned char *, int,
struct neo_colortable *, struct nct_dither *, int) = NULL;
- get_all_args("Image.RAS.decode", args,
+ get_all_args("decode", args,
(args>1 && !UNSAFE_IS_ZERO(&sp[1-args])? "%o%m":"%o"),
&imgo, &optm);
diff --git a/src/modules/Image/encodings/tga.c b/src/modules/Image/encodings/tga.c
index 2933e557688d4312998ccda72c09c502ce057747..a86a16f29e34675360a4b9e9f6fa9e4d70618ef1 100644
--- a/src/modules/Image/encodings/tga.c
+++ b/src/modules/Image/encodings/tga.c
@@ -837,7 +837,7 @@ void image_tga__decode( INT32 args )
{
struct pike_string *data;
struct image_alpha i;
- get_all_args( "Image.TGA._decode", args, "%S", &data );
+ get_all_args( "_decode", args, "%S", &data );
i = load_image( data );
pop_n_elems(args);
@@ -869,7 +869,7 @@ void image_tga_decode( INT32 args )
{
struct pike_string *data;
struct image_alpha i;
- get_all_args( "Image.TGA.decode", args, "%S", &data );
+ get_all_args( "decode", args, "%S", &data );
i = load_image(data);
pop_n_elems(args);
free_object( i.ao );
diff --git a/src/modules/Image/encodings/tim.c b/src/modules/Image/encodings/tim.c
index ff95549988a0691c668e417418acac3815dea143..f7bf3a1d2119b8f50c66ccf371eb504cacc7a5f3 100644
--- a/src/modules/Image/encodings/tim.c
+++ b/src/modules/Image/encodings/tim.c
@@ -174,7 +174,7 @@ void img_tim_decode(INT32 args, int header_only)
INT32 attr;
unsigned int h=0, w=0;
- get_all_args("Image.TIM._decode", args, "%S", &str);
+ get_all_args("_decode", args, "%S", &str);
clut=s=(unsigned char *)str->str;
clut+=20;
len = str->len;
diff --git a/src/modules/Image/font.c b/src/modules/Image/font.c
index d3e740ab9e02a7a4688f0d78f574af247b9024d3..48f08a2bfa51c01574f68e4ae0d712170b7c4993 100644
--- a/src/modules/Image/font.c
+++ b/src/modules/Image/font.c
@@ -311,7 +311,7 @@ void font_load(INT32 args)
size_t size = 0;
char *filename = NULL;
- get_all_args("Image.Font->load()", args, ".%s", &filename);
+ get_all_args("load", args, ".%s", &filename);
if (!filename)
{
diff --git a/src/modules/Image/layers.c b/src/modules/Image/layers.c
index 03c920909596b54058456b32ebeebd6cb8a29244..41229f3cf08b01384c0a9e7d970872e53925aa25 100644
--- a/src/modules/Image/layers.c
+++ b/src/modules/Image/layers.c
@@ -846,7 +846,7 @@ static void image_layer_alpha(INT32 args)
static void image_layer_set_alpha_value(INT32 args)
{
FLOAT_TYPE f;
- get_all_args("Image.Layer->set_alpha_value",args,"%F",&f);
+ get_all_args("set_alpha_value",args,"%F",&f);
if (f<0.0 || f>1.0)
SIMPLE_BAD_ARG_ERROR("Image.Layer->set_alpha_value",1,"float(0..1)");
THIS->alpha_value=f;
@@ -1201,7 +1201,7 @@ static void image_layer_fill_alpha(INT32 args)
static void image_layer_set_offset(INT32 args)
{
- get_all_args("Image.Layer->set_offset",args,"%d%d", /* INT32! */
+ get_all_args("set_offset",args,"%d%d", /* INT32! */
&(THIS->xoffs),&(THIS->yoffs));
pop_n_elems(args);
ref_push_object(THISOBJ);
@@ -1242,7 +1242,7 @@ static void image_layer_ysize(INT32 args)
static void image_layer_set_tiled(INT32 args)
{
INT_TYPE tiled;
- get_all_args("Image.Layer->set_offset",args,"%i",&tiled);
+ get_all_args("set_tiled",args,"%i",&tiled);
THIS->tiled=!!tiled;
THIS->really_optimize_alpha=really_optimize_p(THIS);
pop_n_elems(args);
@@ -1364,7 +1364,7 @@ static void image_layer_create(INT32 args)
{
rgb_group col=black,alpha=white;
- get_all_args("Image.Layer",args,"%d%d", /* watch the type: INT32 */
+ get_all_args("create",args,"%d%d", /* watch the type: INT32 */
&(THIS->xsize),&(THIS->ysize));
if (args>2)
if (!image_color_arg(2-args,&col))
@@ -2909,7 +2909,7 @@ void image_lay(INT32 args)
if (args>1)
{
- get_all_args("Image.lay",args-1,"%i%i%i%i",
+ get_all_args("lay",args-1,"%i%i%i%i",
&xoffset,&yoffset,&xsize,&ysize);
if (xsize<1)
SIMPLE_BAD_ARG_ERROR("Image.lay",4,"int(1..)");
@@ -3086,7 +3086,7 @@ static void image_layer_crop(INT32 args)
int zot=0;
struct image *img = NULL;
- get_all_args("Image.Layer->crop",args,"%i%i%i%i",&x,&y,&xz,&yz);
+ get_all_args("crop",args,"%i%i%i%i",&x,&y,&xz,&yz);
l=clone_this_layer();
if (x<=l->xoffs) x=l->xoffs; else zot++;
diff --git a/src/modules/Java/jvm.c b/src/modules/Java/jvm.c
index 5f9f4d3debe794804b825697d2a78ec76384b175..d130699dd4ce62583dae0be72d6962075522b5e7 100644
--- a/src/modules/Java/jvm.c
+++ b/src/modules/Java/jvm.c
@@ -458,7 +458,7 @@ static void f_jobj_instance(INT32 args)
struct object *cls;
int n=0;
- get_all_args("Java.obj->is_instance_of()", args, "%o", &cls);
+ get_all_args("is_instance_of", args, "%o", &cls);
if((c = get_storage(cls, jclass_program)) == NULL)
Pike_error("Bad argument 1 to is_instance_of().\n");
@@ -554,7 +554,7 @@ static void f_method_create(INT32 args)
JNIEnv *env;
char *p;
- get_all_args("Java.method->create()", args, "%S%S%o", &name, &sig, &class);
+ get_all_args("create", args, "%S%S%o", &name, &sig, &class);
if((c = get_storage(class, jclass_program)) == NULL)
Pike_error("Bad argument 3 to create().\n");
@@ -1179,11 +1179,11 @@ static void f_field_create(INT32 args)
JNIEnv *env;
if(args==1) {
- get_all_args("Java.field->create()", args, "%o", &class);
+ get_all_args("create", args, "%o", &class);
name = NULL;
sig = NULL;
} else
- get_all_args("Java.field->create()", args, "%S%S%o", &name, &sig, &class);
+ get_all_args("create", args, "%S%S%o", &name, &sig, &class);
if((c = get_storage(class, jclass_program)) == NULL)
Pike_error("Bad argument 3 to create().\n");
@@ -2581,7 +2581,7 @@ static void f_natives_create(INT32 args)
int i, rc=-1;
JNIEnv *env;
- get_all_args("Java.natives->create()", args, "%a%o", &arr, &cls);
+ get_all_args("create", args, "%a%o", &arr, &cls);
if((c = get_storage(cls, jclass_program)) == NULL)
Pike_error("Bad argument 2 to create().\n");
@@ -3278,7 +3278,7 @@ static void f_att_create(INT32 args)
struct jvm_storage *jvm;
struct att_storage *att = THIS_ATT;
- get_all_args("Java.attachment->create()", args, "%o", &j);
+ get_all_args("create", args, "%o", &j);
if((jvm = get_storage(j, jvm_program))==NULL)
Pike_error("Bad argument 1 to create().\n");
@@ -3352,7 +3352,7 @@ static void f_monitor_create(INT32 args)
struct monitor_storage *m=THIS_MONITOR;
struct object *obj;
- get_all_args("Java.monitor->create()", args, "%o", &obj);
+ get_all_args("create", args, "%o", &obj);
if(get_storage(obj, jobj_program) == NULL)
Pike_error("Bad argument 1 to create().\n");
diff --git a/src/modules/Odbc/odbc.c b/src/modules/Odbc/odbc.c
index 5e7d14206d89a612ce680bffe99b6f6267091222..5171e23d60b884937ee4c142b718833fd2780155 100644
--- a/src/modules/Odbc/odbc.c
+++ b/src/modules/Odbc/odbc.c
@@ -401,7 +401,7 @@ static void f_create_dsn(INT32 args)
SQLCHAR outconnectionstring[1024]; /* Smallest allowed buffer = 1024 */
SQLSMALLINT stringlength2;
- get_all_args("odbc->create_dsn", args, "%S", &connectstring);
+ get_all_args("create_dsn", args, "%S", &connectstring);
if (!connectstring->len) {
Pike_error("odbc->create_dsn connection string empty.\n");
@@ -465,7 +465,7 @@ static void f_big_query(INT32 args)
struct svalue *save_sp = sp + 1 - args;
#endif /* PIKE_DEBUG */
- get_all_args("odbc->big_query", args, "%W", &q);
+ get_all_args("big_query", args, "%W", &q);
add_ref(q);
SET_ONERROR(ebuf, odbc_free_string, q);
diff --git a/src/modules/Odbc/odbc_result.c b/src/modules/Odbc/odbc_result.c
index 03e6a4e0683360c13ae7ebaee525bb1a0bd52a01..c2363aa352e3f027edc283603af4ce7a3f7ddee7 100644
--- a/src/modules/Odbc/odbc_result.c
+++ b/src/modules/Odbc/odbc_result.c
@@ -416,7 +416,7 @@ static void f_execute(INT32 args)
#ifdef SQL_WCHAR
char *to_free = NULL;
SQLWCHAR *wq = NULL;
- get_all_args("odbc_result->execute", args, "%W", &q);
+ get_all_args("execute", args, "%W", &q);
if ((q->size_shift > 1) && (sizeof(SQLWCHAR) == 2)) {
SIMPLE_ARG_TYPE_ERROR("execute", 1, "string(16bit)");
}
@@ -428,7 +428,7 @@ static void f_execute(INT32 args)
}
}
#else
- get_all_args("odbc_result->execute", args, "%S", &q);
+ get_all_args("execute", args, "%S", &q);
#endif
ODBC_ALLOW();
diff --git a/src/modules/Oracle/oracle.c b/src/modules/Oracle/oracle.c
index ed59f8c983680df537754d3254af78ca1fc4e13d..819cce7145bc8d5a27fdcb8443bdbff4fa7d9cf2 100644
--- a/src/modules/Oracle/oracle.c
+++ b/src/modules/Oracle/oracle.c
@@ -1952,7 +1952,7 @@ static void f_compile_query_create(INT32 args)
fprintf(stderr,"%s\n",__FUNCTION__);
#endif
- get_all_args("Oracle->compile_query", args, "%S", &query);
+ get_all_args("compile_query", args, "%S", &query);
#ifdef ORACLE_DEBUG
fprintf(stderr,"f_compile_query_create: dbquery: %p\n",dbquery);
diff --git a/src/modules/Postgres/postgres.c b/src/modules/Postgres/postgres.c
index e80b865d81822125aede3544436c62f2c462e766..322ab78138262b372c53c1cba1f150388f181317 100644
--- a/src/modules/Postgres/postgres.c
+++ b/src/modules/Postgres/postgres.c
@@ -258,7 +258,7 @@ static void f_create (INT32 args)
PGconn * conn;
PQ_FETCH();
- get_all_args("postgres->create",args,
+ get_all_args("create",args,
".%s%s%s%s%d%G",
&host,
&db,
@@ -332,7 +332,7 @@ static void f_select_db (INT32 args)
PGconn * conn, *newconn;
PQ_FETCH();
- get_all_args("Postgres->select_db",args,"%s", &db);
+ get_all_args("select_db",args,"%s", &db);
if (!THIS->dblink)
Pike_error ("Driver error. How can you possibly not be linked to a "
@@ -817,7 +817,7 @@ static void f_quote(INT32 args)
struct pike_string *s;
char *err_msg;
- get_all_args("Postgres->_quote", args, "%S", &s);
+ get_all_args("_quote", args, "%S", &s);
ret = begin_shared_string(s->len * 2 + 1);
#ifdef HAVE_PQESCAPESTRINGCONN
diff --git a/src/modules/Regexp/glue.c b/src/modules/Regexp/glue.c
index 95c581779b22302afda72666fde74ec3211604f3..0ae7b6cb26702035ef72d0f7c1d204aec8f98f01 100644
--- a/src/modules/Regexp/glue.c
+++ b/src/modules/Regexp/glue.c
@@ -91,7 +91,7 @@ static void regexp_create(INT32 args)
do_free();
if(args)
{
- get_all_args("Regexp.SimpleRegexp->create", args, "%s", &str);
+ get_all_args("create", args, "%s", &str);
THIS->regexp=pike_regcomp(Pike_sp[-args].u.string->str, 0);
}
}
@@ -186,7 +186,7 @@ static void regexp_split(INT32 args)
struct pike_string *s;
struct regexp *r;
- get_all_args("Regexp.SimpleRegexp->split", args, "%S", &s);
+ get_all_args("split", args, "%S", &s);
if(pike_regexec(r=THIS->regexp, s->str))
{
diff --git a/src/modules/_Charset/charsetmod.c b/src/modules/_Charset/charsetmod.c
index d64cbff4eff1277b052102fac2623e511cc568a3..b10af2f98c912669ef151b82bbc40b1b1b94fe80 100644
--- a/src/modules/_Charset/charsetmod.c
+++ b/src/modules/_Charset/charsetmod.c
@@ -420,7 +420,7 @@ static void f_std_feed(INT32 args, ptrdiff_t (*func)(struct pike_string *,
struct pike_string *str;
ptrdiff_t l;
- get_all_args("feed()", args, "%W", &str);
+ get_all_args("feed", args, "%W", &str);
if(str->size_shift>0)
Pike_error("Can't feed on wide strings!\n");
@@ -929,7 +929,7 @@ static void f_create_multichar(INT32 args)
const struct multichar_def *def = multichar_map;
struct multichar_stor *s = (struct multichar_stor *)(fp->current_storage + multichar_stor_offs);
- get_all_args("create()", args, "%s", &name);
+ get_all_args("create", args, "%s", &name);
while(1) {
if(def->name == 0)
@@ -1177,7 +1177,7 @@ static void f_feed_gb18030e(INT32 args)
struct pike_string *str;
struct std_cs_stor *cs = (struct std_cs_stor *)fp->current_storage;
- get_all_args("feed()", args, "%W", &str);
+ get_all_args("feed", args, "%W", &str);
feed_gb18030e(cs, &cs->strbuild, str, cs->replace, MKREPCB(cs->repcb));
@@ -1258,7 +1258,7 @@ static void f_feed_gbke(INT32 args)
struct pike_string *str;
struct std_cs_stor *cs = (struct std_cs_stor *)fp->current_storage;
- get_all_args("feed()", args, "%W", &str);
+ get_all_args("feed", args, "%W", &str);
feed_gbke(cs, &cs->strbuild, str, cs->replace, MKREPCB(cs->repcb));
@@ -1843,7 +1843,7 @@ static void f_feed_utf8e(INT32 args)
struct pike_string *str;
struct std_cs_stor *cs = (struct std_cs_stor *)fp->current_storage;
- get_all_args("feed()", args, "%W", &str);
+ get_all_args("feed", args, "%W", &str);
feed_utf8e(cs, &cs->strbuild, str, cs->replace, MKREPCB(cs->repcb));
@@ -1979,7 +1979,7 @@ static void f_feed_utf_ebcdice(INT32 args)
struct pike_string *str;
struct std_cs_stor *cs = (struct std_cs_stor *)fp->current_storage;
- get_all_args("feed()", args, "%W", &str);
+ get_all_args("feed", args, "%W", &str);
feed_utf_ebcdice(cs, &cs->strbuild, str, cs->replace, MKREPCB(cs->repcb));
@@ -2052,7 +2052,7 @@ static void f_feed_utf7_5e(INT32 args)
struct pike_string *str;
struct std_cs_stor *cs = (struct std_cs_stor *)fp->current_storage;
- get_all_args("feed()", args, "%W", &str);
+ get_all_args("feed", args, "%W", &str);
feed_utf7_5e(cs, &cs->strbuild, str, cs->replace, MKREPCB(cs->repcb));
@@ -2212,7 +2212,7 @@ static void f_feed_utf7e(INT32 args)
struct pike_string *str;
struct std_cs_stor *cs = (struct std_cs_stor *)fp->current_storage;
- get_all_args("feed()", args, "%W", &str);
+ get_all_args("feed", args, "%W", &str);
feed_utf7e((struct utf7_stor *)(((char*)fp->current_storage)+utf7_stor_offs),
&cs->strbuild, str, cs->replace, MKREPCB(cs->repcb));
@@ -2325,7 +2325,7 @@ static void f_feed_std8e(INT32 args)
struct pike_string *str;
struct std_cs_stor *cs = (struct std_cs_stor *)fp->current_storage;
- get_all_args("feed()", args, "%W", &str);
+ get_all_args("feed", args, "%W", &str);
feed_std8e((struct std8e_stor *)(((char*)fp->current_storage)+
std8e_stor_offs),
@@ -2434,7 +2434,7 @@ static void f_feed_std16e(INT32 args)
struct pike_string *str;
struct std_cs_stor *cs = (struct std_cs_stor *)fp->current_storage;
- get_all_args("feed()", args, "%W", &str);
+ get_all_args("feed", args, "%W", &str);
feed_std16e((struct std16e_stor *)(((char*)fp->current_storage)+
std16e_stor_offs),
diff --git a/src/modules/_Image_FreeType/freetype.c b/src/modules/_Image_FreeType/freetype.c
index f3b849907e97bacfb9a7fc9baf1b6456c6485fec..3de192da8b8e70ba3cd2af1a36773ffbe2a87a9a 100644
--- a/src/modules/_Image_FreeType/freetype.c
+++ b/src/modules/_Image_FreeType/freetype.c
@@ -354,7 +354,7 @@ static void image_ft_face_create( INT32 args )
FT_Encoding best_enc = ft_encoding_none;
int enc_no, enc_score, best_enc_score = -2;
- get_all_args("FreeType.Face", args, "%s.%d", &font, &face_number);
+ get_all_args("create", args, "%s.%d", &font, &face_number);
if (face_number < 0) {
SIMPLE_BAD_ARG_ERROR("FreeType.Face", 2, "int(0..)");
diff --git a/src/modules/_Image_JPEG/image_jpeg.c b/src/modules/_Image_JPEG/image_jpeg.c
index 9e64c883f20f806dae3d0d8aa5e9af05e3b7af8b..6712420b954fe72e9613ee11a7054cdf50992f99 100644
--- a/src/modules/_Image_JPEG/image_jpeg.c
+++ b/src/modules/_Image_JPEG/image_jpeg.c
@@ -1341,7 +1341,7 @@ void image_jpeg_quant_tables(INT32 args)
if (args)
{
INT_TYPE q;
- get_all_args("Image.JPEG.quant_tables",args,"%i",&q);
+ get_all_args("quant_tables",args,"%i",&q);
jpeg_set_quality(&cinfo,q,0);
}
diff --git a/src/modules/_Image_TIFF/image_tiff.c b/src/modules/_Image_TIFF/image_tiff.c
index 3ec000446b4b0d7a1fd92b7be624aa00f4681099..220ebc06cfaa81f86fed0061592a43c00dbb2db9 100644
--- a/src/modules/_Image_TIFF/image_tiff.c
+++ b/src/modules/_Image_TIFF/image_tiff.c
@@ -906,7 +906,7 @@ static void image_tiff_encode( INT32 args )
ONERROR onerr;
a.alpha = 0;
- get_all_args( "Image.TIFF.encode", args, "%o", &a.img );
+ get_all_args( "encode", args, "%o", &a.img );
MEMSET(&c, 0, sizeof(c));
diff --git a/src/modules/_Stdio/file.c b/src/modules/_Stdio/file.c
index d9e8ca6b37145c35ee83a4fee6c0cfc1bd1f68ba..2289445f92079680e7979685e5c0a43573f43f6a 100644
--- a/src/modules/_Stdio/file.c
+++ b/src/modules/_Stdio/file.c
@@ -2402,7 +2402,7 @@ static void file_linger(INT32 args)
if(fd < 0)
Pike_error("File not open.\n");
- get_all_args("Stdio.File->linger", args, ".%d", &linger);
+ get_all_args("linger", args, ".%d", &linger);
if ((linger < -1) || (linger > 0xffff)) {
SIMPLE_BAD_ARG_ERROR("Stdio.File->linger()", 1, "int(-1..65535)");
@@ -2854,8 +2854,7 @@ static void file_openat(INT32 args)
if((dir_fd = FD) < 0)
Pike_error("File not open.\n");
- get_all_args("Stdio.File->openat", args, "%S%S.%d",
- &str, &flag_str, &access);
+ get_all_args("openat", args, "%S%S.%d", &str, &flag_str, &access);
flags = parse(flag_str->str);
@@ -4882,7 +4881,7 @@ static void file_set_keepalive(INT32 args)
int tmp, i;
INT_TYPE t;
- get_all_args("Stdio.File->set_keepalive", args, "%i", &t);
+ get_all_args("set_keepalive", args, "%i", &t);
/* In case int and INT_TYPE have different sizes */
tmp = t;
@@ -5028,9 +5027,9 @@ static void file_connect(INT32 args)
int tries;
if (args < 4) {
- get_all_args("Stdio.File->connect", args, "%S%*", &dest_addr, &dest_port);
+ get_all_args("connect", args, "%S%*", &dest_addr, &dest_port);
} else {
- get_all_args("Stdio.File->connect", args, "%S%*%S%*",
+ get_all_args("connect", args, "%S%*%S%*",
&dest_addr, &dest_port, &src_addr, &src_port);
}
diff --git a/src/modules/_Stdio/socket.c b/src/modules/_Stdio/socket.c
index 9b4c4980105e6c3e84928e7fc3af7ebb209c060a..10db8e39a2e1601e0839f32e424c9f4ef1a134ba 100644
--- a/src/modules/_Stdio/socket.c
+++ b/src/modules/_Stdio/socket.c
@@ -197,7 +197,7 @@ static void port_listen_fd(INT32 args)
int fd;
do_close(p);
- get_all_args("Port->listen_fd", args, "%d.%*", &fd, &cb);
+ get_all_args("listen_fd", args, "%d.%*", &fd, &cb);
if(fd<0)
{
@@ -371,7 +371,7 @@ static void bind_unix(INT32 args)
do_close(p);
- get_all_args("Port->bind_unix", args, "%n.%*", &path, &cb);
+ get_all_args("bind_unix", args, "%n.%*", &path, &cb);
/* NOTE: Some operating systems (eg Linux 2.6) do not support
* paths longer than what fits into a plain struct sockaddr_un.
diff --git a/src/modules/_Stdio/udp.c b/src/modules/_Stdio/udp.c
index d589bffe02b1949b5e92a549ca633633d90e45af..3eb7637f24cbf50971d1120159206b18fcbabed3 100644
--- a/src/modules/_Stdio/udp.c
+++ b/src/modules/_Stdio/udp.c
@@ -1121,7 +1121,7 @@ static void udp_connect(INT32 args)
int tmp;
- get_all_args("UDP.connect", args, "%S%*", &dest_addr, &dest_port);
+ get_all_args("connect", args, "%S%*", &dest_addr, &dest_port);
if(TYPEOF(*dest_port) != PIKE_T_INT &&
(TYPEOF(*dest_port) != PIKE_T_STRING || dest_port->u.string->size_shift))
@@ -1298,7 +1298,7 @@ static void udp_set_type(INT32 args)
{
int type, proto = 0;
- get_all_args("Stdio.UDP->set_type",args,"%d.%d",&type,&proto);
+ get_all_args("set_type",args,"%d.%d",&type,&proto);
THIS->type=type;
THIS->protocol=proto;
@@ -1345,7 +1345,7 @@ static void udp_set_buffer(INT32 args)
if(FD==-1)
Pike_error("Stdio.UDP->set_buffer() on closed file.\n");
- get_all_args("Stdio.UDP->set_buffer", args, "%+.%s", &bufsize, &c);
+ get_all_args("set_buffer", args, "%+.%s", &bufsize, &c);
if(bufsize < 0)
Pike_error("Bufsize must be larger than zero.\n");
diff --git a/src/modules/_WhiteFish/linkfarm.c b/src/modules/_WhiteFish/linkfarm.c
index a4c10bb65a97140fd91079a2ad9f988946eb0e77..6110cd624ad9a155a536c7c2eb3a0e4203f19cf2 100644
--- a/src/modules/_WhiteFish/linkfarm.c
+++ b/src/modules/_WhiteFish/linkfarm.c
@@ -134,7 +134,7 @@ static void f_linkfarm_add( INT32 args )
struct pike_string *s;
struct linkfarm *f = THIS;
- get_all_args("LinkFarm()->add", args, "%W", &s);
+ get_all_args("add", args, "%W", &s);
low_add(f, s);
pop_n_elems(args);
}
diff --git a/src/modules/system/memory.c b/src/modules/system/memory.c
index 26ec45cbb5d0b0cf1a5d336651e21fbbe8bae774..13fc76fd08457553f8f1ee9857fe531ba1e1456f 100644
--- a/src/modules/system/memory.c
+++ b/src/modules/system/memory.c
@@ -342,7 +342,7 @@ static void memory__mmap(INT32 args,int complain,int private)
else if (TYPEOF(sp[-args]) == T_STRING)
{
char *filename;
- get_all_args("Memory.mmap",args,"%s",&filename); /* 8 bit! */
+ get_all_args("mmap",args,"%s",&filename); /* 8 bit! */
THREADS_ALLOW();
fd = fd_open(filename,fd_RDWR,0);
@@ -452,9 +452,9 @@ static void memory_allocate(INT32 args)
unsigned char *mem;
if (args>=2)
- get_all_args("Memory.allocate",args,"%+%+",&size,&c);
+ get_all_args("allocate",args,"%+%+",&size,&c);
else
- get_all_args("Memory.allocate",args,"%+",&size);
+ get_all_args("allocate",args,"%+",&size);
/* just to be sure */
if (size<0)
@@ -812,7 +812,7 @@ static void memory_index(INT32 args)
{
INT_TYPE pos;
size_t rpos = 0;
- get_all_args("Memory.`[]",args,"%i",&pos);
+ get_all_args("`[]",args,"%i",&pos);
if (pos<0) {
if ((off_t)-pos>=DO_NOT_WARN((off_t)THIS->size))
Pike_error("Memory.`[]: Index is out of range\n");
@@ -838,7 +838,7 @@ static void memory_index(INT32 args)
INT_TYPE pos1,pos2;
size_t rpos1,rpos2;
- get_all_args("Memory.`[]",args,"%i%i",&pos1,&pos2);
+ get_all_args("`[]",args,"%i%i",&pos1,&pos2);
if (pos1<0) rpos1=0; else rpos1=(size_t)pos1;
if ((size_t)pos2>=THIS->size) rpos2=THIS->size-1;
else rpos2=(size_t)pos2;
@@ -867,7 +867,7 @@ static void memory_index_write(INT32 args)
{
INT_TYPE pos,ch;
size_t rpos = 0;
- get_all_args("Memory.`[]=",args,"%i%i",&pos,&ch);
+ get_all_args("`[]=",args,"%i%i",&pos,&ch);
if (pos<0)
if ((off_t)-pos>=DO_NOT_WARN((off_t)THIS->size))
Pike_error("Memory.`[]=: Index is out of range\n");
@@ -890,7 +890,7 @@ static void memory_index_write(INT32 args)
INT_TYPE pos1, pos2;
struct pike_string *ps;
- get_all_args("Memory.`[]=", args, "%i%i%S", &pos1, &pos2, &ps);
+ get_all_args("`[]=", args, "%i%i%S", &pos1, &pos2, &ps);
if (pos1 < 0) pos1 = 0;
if (pos2 < 0) pos2 = 0;
diff --git a/src/modules/system/nt.c b/src/modules/system/nt.c
index aec59c3f2d6d9b9b10e065b28744b98476b2444e..079d8670cca81e8ba059b29e0a29a61cc7576250 100644
--- a/src/modules/system/nt.c
+++ b/src/modules/system/nt.c
@@ -3583,7 +3583,7 @@ static void f_sctx_create(INT32 args)
TimeStamp Lifetime;
char * pkgName;
- get_all_args("system.SecurityContext->create",args,"%s",&pkgName);
+ get_all_args("create",args,"%s",&pkgName);
lstrcpy(sctx->lpPackageName, pkgName);
ss = querysecuritypackageinfo ( sctx->lpPackageName, &pkgInfo);
diff --git a/src/post_modules/COM/com.c b/src/post_modules/COM/com.c
index fdff33ea7497116d888c58d054c9045872e0599c..3c3de3f9cb7f4369423595e67509befa7c1def14 100644
--- a/src/post_modules/COM/com.c
+++ b/src/post_modules/COM/com.c
@@ -927,7 +927,7 @@ static void f_cobj_create(INT32 args)
if (args > 0)
{
- get_all_args("Com.obj->create()", args, "%W", &progID);
+ get_all_args("create", args, "%W", &progID);
progID2 = MKPCHARP(malloc(progID->len * 2 + 2), 1);
pike_string_cpy(progID2, progID);
SET_INDEX_PCHARP(progID2, progID->len, 0);
@@ -993,7 +993,7 @@ static void f_cobj_getprop(INT32 args)
struct pike_string *prop;
PCHARP propU;
- get_all_args("Com.obj->get_prop()", args, "%W", &prop);
+ get_all_args("get_prop", args, "%W", &prop);
propU = MKPCHARP(malloc(prop->len * 2 + 2), 1);
pike_string_cpy(propU, prop);
SET_INDEX_PCHARP(propU, prop->len, 0);
@@ -1411,8 +1411,7 @@ static void f_create_object(INT32 args)
PCHARP progID2;
IDispatch *pDispatch;
- get_all_args("Com->create_object()", args, "%W", &progID);
- //check_all_args("create_object", args, BIT_STRING, 0);
+ get_all_args("create_object", args, "%W", &progID);
progID2 = MKPCHARP(malloc(progID->len * 2 + 2), 1);
pike_string_cpy(progID2, progID);
diff --git a/src/post_modules/GTK1/source/gdkcolor.pre b/src/post_modules/GTK1/source/gdkcolor.pre
index 78df4bac93c346e61cfd40fbd0ba205cd29924a8..25d2239e82775144b7e0daf823571f997795253a 100644
--- a/src/post_modules/GTK1/source/gdkcolor.pre
+++ b/src/post_modules/GTK1/source/gdkcolor.pre
@@ -18,13 +18,13 @@ void create(object|int color_or_r,int|void g,int|void b)
if( args == 1)
{
struct object *o;
- get_all_args("GdkColor", args, "%o", &o);
+ get_all_args("create", args, "%o", &o);
if( !get_color_from_pikecolor( o, &r, &g, &b ) )
Pike_error("Bad argument 1 to GDK1.Color(). Exptected color object\n");
}
else
{
- get_all_args("GdkColor", args, "%i%i%i", &r, &g, &b);
+ get_all_args("create", args, "%i%i%i", &r, &g, &b);
r*=257;
g*=257;
b*=257;
diff --git a/src/post_modules/GTK1/source/gdkgc.pre b/src/post_modules/GTK1/source/gdkgc.pre
index c62e8040415f6eca6b944d764dd633990e63d61f..aac65b5cae46464e66c12801510b9c10a4fcde10 100644
--- a/src/post_modules/GTK1/source/gdkgc.pre
+++ b/src/post_modules/GTK1/source/gdkgc.pre
@@ -16,14 +16,14 @@ void create( GTK1.Widget|GDK1.Drawable context, mapping|void attributes )
struct mapping *m;
pgtk_verify_setup();
pgtk_verify_not_inited();
- get_all_args("'()", args, "%o", &o);
+ get_all_args("create", args, "%o", &o);
memset( &values, 0, sizeof(values));
if( args > 1 )
{
struct svalue *sv;
have_values = 1;
- get_all_args("'()", args, "%o%m", &o, &m);
+ get_all_args("create", args, "%o%m", &o, &m);
#define VALUE(X,Y) \
if(sv=simple_mapping_string_lookup(m,#X)) \
diff --git a/src/post_modules/GTK1/source/gdkrectangle.pre b/src/post_modules/GTK1/source/gdkrectangle.pre
index e24c6065c861ba4118bb013d53ad8ec397cee099..c03aa1d39f7c50f4d26e3ef0b9550b61a6b01ae4 100644
--- a/src/post_modules/GTK1/source/gdkrectangle.pre
+++ b/src/post_modules/GTK1/source/gdkrectangle.pre
@@ -10,7 +10,7 @@ void create(int x, int y, int width, int height)
pgtk_verify_setup();
pgtk_verify_not_inited();
THIS->obj = (void *)(r=g_malloc(sizeof(GdkRectangle)));
- get_all_args( "GDK1.Rectangle", args, "%i%i%i%i", &x, &y, &w, &h );
+ get_all_args( "create", args, "%i%i%i%i", &x, &y, &w, &h );
r->x = x;
r->y = y;
r->width = w;
@@ -23,7 +23,7 @@ void set(int x, int y, int width, int height )
{
GdkRectangle *r = (GdkRectangle *)THIS->obj;
INT_TYPE x, y, w, h;
- get_all_args( "GDK1.Rectangle", args, "%i%i%i%i", &x, &y, &w, &h );
+ get_all_args( "set", args, "%i%i%i%i", &x, &y, &w, &h );
r->x = x;
r->y = y;
r->width = w;
diff --git a/src/post_modules/GTK1/source/gdkwindow.pre b/src/post_modules/GTK1/source/gdkwindow.pre
index 5f85f235f0277de1071593ed1aa710aad94fa284..5d782d4366c1f2a3ac79bc8c36608b14c8e9e43c 100644
--- a/src/post_modules/GTK1/source/gdkwindow.pre
+++ b/src/post_modules/GTK1/source/gdkwindow.pre
@@ -19,7 +19,7 @@ void create(GDK1.Window|int parent, mapping|void attributes)
if(TYPEOF(Pike_sp[-args]) == PIKE_T_INT)
{
INT_TYPE id;
- get_all_args( "GdkWindow", args, "%i", &id );
+ get_all_args( "create", args, "%i", &id );
THIS->obj = (void *)gdk_window_foreign_new( id );
if( !THIS->obj )
Pike_error("The window with id 0x%x does not exist\n", id);
@@ -29,7 +29,7 @@ void create(GDK1.Window|int parent, mapping|void attributes)
GdkWindowAttr attrs;
long mask = 0;
MEMSET(&attrs, 0, sizeof(attrs));
- get_all_args( "GdkWindow", args, "%o%m", &parent, &m );
+ get_all_args( "create", args, "%o%m", &parent, &m );
#define GET_ARG(x,y,z) pgtk_get_mapping_arg( m, #x, y, z, &attrs.x, &mask, sizeof(attrs.x))
diff --git a/src/post_modules/GTK1/source/gladexml.pre b/src/post_modules/GTK1/source/gladexml.pre
index 5781bb0ba9c4b48b55e1a0253c910924548e1b3d..c70995078ffd793e0244cbbd94bee253792b37ab 100644
--- a/src/post_modules/GTK1/source/gladexml.pre
+++ b/src/post_modules/GTK1/source/gladexml.pre
@@ -42,7 +42,7 @@ class GTK1.GladeXML;
"after: %d\n",
handler_name, signal_name, signal_data, after);
#endif
- get_all_args("GTK1.GladeXML->_signal_connect",
+ get_all_args("_signal_connect",
*(INT32 *)args, "%m%*", &callbacks, &data);
funname = make_shared_string(handler_name);
@@ -274,7 +274,7 @@ string get_widget_long_name(GTK1.Widget widget)
GtkWidget *widget = NULL;
const char *name;
- get_all_args("GladeXML->get_widget_long_name", args, "%o", &obj);
+ get_all_args("get_widget_long_name", args, "%o", &obj);
widget = GTK_WIDGET(get_gtkobject(obj));
if(!widget)
Pike_error("GladeXML->get_widget_long_name: Invalid argument 1, wanted GTK object of type WIDGET.\n");
@@ -299,7 +299,7 @@ string get_widget_name(GTK1.Widget widget)
GtkWidget *widget = NULL;
const char *name;
- get_all_args("GladeXML->get_widget_name", args, "%o", &obj);
+ get_all_args("get_widget_name", args, "%o", &obj);
widget = GTK_WIDGET(get_gtkobject(obj));
if(!widget)
Pike_error("GladeXML->get_widget_name: Invalid argument 1, wanted GTK object of type WIDGET.\n");
diff --git a/src/post_modules/GTK1/source/gtkclist.pre b/src/post_modules/GTK1/source/gtkclist.pre
index eeed3c01ee636aab29cbf99a3bd5db14e1dd4a38..bdaea175a0579fbb8a6b2c5a840028a5be3b493a 100644
--- a/src/post_modules/GTK1/source/gtkclist.pre
+++ b/src/post_modules/GTK1/source/gtkclist.pre
@@ -143,7 +143,7 @@ void get_text(int row, int col)
{
INT_TYPE x, y;
gchar *p = NULL;
- get_all_args( "get_*", args, "%i%i", &x, &y );
+ get_all_args( "get_text", args, "%i%i", &x, &y );
my_pop_n_elems( args );
gtk_clist_get_text( GTK_CLIST( THIS->obj ), x, y, &p );
@@ -176,7 +176,7 @@ void get_pixmap(int row, int column)
INT_TYPE x, y;
GdkPixmap *p = NULL;
GdkBitmap *b = NULL;
- get_all_args( "get_*", args, "%i%i", &x, &y );
+ get_all_args( "get_pixmap", args, "%i%i", &x, &y );
my_pop_n_elems( args );
gtk_clist_get_pixmap( GTK_CLIST( THIS->obj ), x, y, &p, &b );
@@ -228,7 +228,7 @@ mapping get_pixtext(int row, int col)
gchar *t = NULL;
GdkPixmap *p = NULL;
GdkBitmap *b = NULL;
- get_all_args( "get_*", args, "%i%i", &x, &y );
+ get_all_args( "get_pixtext", args, "%i%i", &x, &y );
gtk_clist_get_pixtext( GTK_CLIST( THIS->obj ), x, y, &t, &s, &p, &b );
my_pop_n_elems( args );
diff --git a/src/post_modules/GTK1/source/gtkctree.pre b/src/post_modules/GTK1/source/gtkctree.pre
index 8efa751e97a814d9cb536ae4249818ec9515fb82..e52eb2dc19c41cdc80ca3b20b02d94dd26fb8b93 100644
--- a/src/post_modules/GTK1/source/gtkctree.pre
+++ b/src/post_modules/GTK1/source/gtkctree.pre
@@ -239,7 +239,7 @@ string node_get_text(GTK1.CTreeNode node, int column)
struct object *x;
INT_TYPE y;
gchar *p = NULL;
- get_all_args( "get_*", args, "%o%i", &x, &y );
+ get_all_args( "get_text", args, "%o%i", &x, &y );
my_pop_n_elems( args );
if(y==0)
@@ -264,7 +264,7 @@ mapping node_get_pixmap( GTK1.CtreeNode node, int column )
INT_TYPE y;
GdkPixmap *p = NULL;
GdkBitmap *b = NULL;
- get_all_args( "get_*", args, "%o%i", &x, &y );
+ get_all_args( "get_pixmap", args, "%o%i", &x, &y );
my_pop_n_elems( args );
gtk_ctree_node_get_pixmap( GTK_CTREE( THIS->obj ),
@@ -301,7 +301,7 @@ mapping node_get_pixtext(GTK1.CTreeNode n, int columne )
GdkPixmap *p = NULL;
GdkBitmap *b = NULL;
guint8 s = 0;
- get_all_args( "get_*", args, "%o%i", &x, &y );
+ get_all_args( "get_pixtext", args, "%o%i", &x, &y );
gtk_ctree_node_get_pixtext( GTK_CTREE( THIS->obj ),
get_pgdkobject(x,pgtk_ctree_node_program),
diff --git a/src/post_modules/GTK1/source/gtktreeitem.pre b/src/post_modules/GTK1/source/gtktreeitem.pre
index d841fce17815f39b0bd40c3fa6fc41e1b4727920..1bfc5bf79efe1ca79102497eabc4667d6b5427e3 100644
--- a/src/post_modules/GTK1/source/gtktreeitem.pre
+++ b/src/post_modules/GTK1/source/gtktreeitem.pre
@@ -16,7 +16,7 @@ void create(?string label)
if(args)
{
char *s;
- get_all_args("GTK1.Tree_item", args, "%s", &s);
+ get_all_args("create", args, "%s", &s);
THIS->obj = GTK_OBJECT( gtk_tree_item_new_with_label( s ) );
} else {
THIS->obj = GTK_OBJECT( gtk_tree_item_new( ) );
diff --git a/src/post_modules/GTK2/source/gdkcolor.pre b/src/post_modules/GTK2/source/gdkcolor.pre
index 2772e5b9126378f741cfda81a7ad3f8e8aedb960..54e4ead1966d6eebaba5aaca5969b0d776608a86 100644
--- a/src/post_modules/GTK2/source/gdkcolor.pre
+++ b/src/post_modules/GTK2/source/gdkcolor.pre
@@ -19,11 +19,11 @@ void create(object|int color_or_r,int|void g,int|void b)
pgtk2_verify_not_inited();
if (args==1) {
struct object *o;
- get_all_args("GdkColor",args,"%o",&o);
+ get_all_args("create",args,"%o",&o);
if (!get_color_from_pikecolor(o,&r,&g,&b))
Pike_error("Bad argument 1 to GDK2.Color(). Exptected color object\n");
} else {
- get_all_args("GdkColor",args,"%i%i%i",&r,&g,&b);
+ get_all_args("create",args,"%i%i%i",&r,&g,&b);
r*=257;
g*=257;
b*=257;
diff --git a/src/post_modules/GTK2/source/gladexml.pre b/src/post_modules/GTK2/source/gladexml.pre
index 79b40925a7f57748b09373eeef5033c451dae390..b25fdab8ef8ad0a34a7f84a822f1ad6c160f5cd4 100644
--- a/src/post_modules/GTK2/source/gladexml.pre
+++ b/src/post_modules/GTK2/source/gladexml.pre
@@ -32,8 +32,7 @@ static void pgtk2__signal_connect(const gchar *handler_name,
"after: %d\n",
handler_name,signal_name,signal_data,after);
#endif
- get_all_args("GTK2.GladeXML->_signal_connect",*(INT32 *)args,
- "%m%*",&callbacks,&data);
+ get_all_args("_signal_connect",*(INT32 *)args,"%m%*",&callbacks,&data);
/*
funname=make_shared_string(handler_name);
cb=low_mapping_string_lookup(callbacks,funname);
diff --git a/src/post_modules/GTK2/source/global.pre b/src/post_modules/GTK2/source/global.pre
index d22474a9987ece18da333cc392e80f6d19af447e..67a3425be6247b64bacf546b789e5d5ef62beaa3 100644
--- a/src/post_modules/GTK2/source/global.pre
+++ b/src/post_modules/GTK2/source/global.pre
@@ -332,7 +332,7 @@ int main_iteration_do(int block)
//! event before returning.
{
INT_TYPE n;
- get_all_args( "gtk_main_iteration_do", args, "%i", &n );
+ get_all_args( "main_iteration_do", args, "%i", &n );
pgtk2_pop_n_elems(args);
push_int( g_main_iteration( n ) );
}
@@ -355,7 +355,7 @@ void grab_add(GTK2.Widget widget)
//! Grab a widget.
{
struct object *o;
- get_all_args("gtk_grab_add",args,"%o",&o);
+ get_all_args("grab_add",args,"%o",&o);
gtk_grab_add(GTK_WIDGET(get_gobject(o)));
pgtk2_pop_n_elems(args);
}
@@ -364,7 +364,7 @@ void grab_remove(GTK2.Widget widget)
//! Remove the grab.
{
struct object *o;
- get_all_args("gtk_grab_remove",args,"%o",&o);
+ get_all_args("grab_remove",args,"%o",&o);
gtk_grab_remove(GTK_WIDGET(get_gobject(o)));
pgtk2_pop_n_elems(args);
}
diff --git a/src/post_modules/_Regexp_PCRE/pcre_glue.cmod b/src/post_modules/_Regexp_PCRE/pcre_glue.cmod
index f4de8b2849e985c3d01da82cc1d5a8b986cfaff4..096aabd2999b51ad875e432fc7ab5da1bfa97713 100644
--- a/src/post_modules/_Regexp_PCRE/pcre_glue.cmod
+++ b/src/post_modules/_Regexp_PCRE/pcre_glue.cmod
@@ -94,17 +94,17 @@ PIKECLASS _pcre
default:
if (TYPEOF(Pike_sp[2-args]) != T_INT) /* allow NULL table */
{
- get_all_args("pcre->create",args,"%S%d%o",
+ get_all_args("create",args,"%S%d%o",
&(THIS->pattern),&options,&table);
break;
}
case 2:
- get_all_args("pcre->create",args,"%S%d",
+ get_all_args("create",args,"%S%d",
&(THIS->pattern),&options);
break;
case 1:
case 0:
- get_all_args("pcre->create",args,"%S",&(THIS->pattern));
+ get_all_args("create",args,"%S",&(THIS->pattern));
break;
}
add_ref(THIS->pattern);
diff --git a/src/signal_handler.c b/src/signal_handler.c
index 8a774c1da051abc08a605bd8a210339feaacedbd..d363210d8a847dc859d39b3df67c1a25f7d375a4 100644
--- a/src/signal_handler.c
+++ b/src/signal_handler.c
@@ -4543,9 +4543,9 @@ static void f_pid_status_kill(INT32 args)
ASSERT_SECURITY_ROOT("Process->kill");
- get_all_args("pid->kill", args, "%+", &signum);
+ get_all_args("kill", args, "%+", &signum);
- PROC_FPRINTF((stderr, "[%d] pid->kill: pid=%d, signum=%d\n",
+ PROC_FPRINTF((stderr, "[%d] kill: pid=%d, signum=%d\n",
getpid(), pid, signum));
THREADS_ALLOW_UID();
@@ -4644,7 +4644,7 @@ static void f_pid_status_kill(INT32 args)
ASSERT_SECURITY_ROOT("Process->kill");
- get_all_args("pid->kill", args, "%i", &signum);
+ get_all_args("kill", args, "%i", &signum);
pop_n_elems(args);
diff --git a/src/threads.c b/src/threads.c
index 636218af81556589f1ea7c35d96c1338d6630189..3714653f9fb17a3c09b9a97771c95c5fe0f92d35 100644
--- a/src/threads.c
+++ b/src/threads.c
@@ -2101,13 +2101,13 @@ void f_mutex_lock(INT32 args)
if(!args)
type=0;
else
- get_all_args("mutex->lock",args,"%i",&type);
+ get_all_args("lock",args,"%i",&type);
switch(type)
{
default:
- bad_arg_error("mutex->lock", Pike_sp-args, args, 2, "int(0..2)", Pike_sp+1-args,
- "Unknown mutex locking style: %"PRINTPIKEINT"d\n",type);
+ bad_arg_error("lock", Pike_sp-args, args, 2, "int(0..2)", Pike_sp+1-args,
+ "Unknown mutex locking style: %"PRINTPIKEINT"d\n",type);
case 0:
@@ -2203,13 +2203,13 @@ void f_mutex_trylock(INT32 args)
if(!args)
type=0;
else
- get_all_args("mutex->trylock",args,"%i",&type);
+ get_all_args("trylock",args,"%i",&type);
switch(type)
{
default:
- bad_arg_error("mutex->trylock", Pike_sp-args, args, 2, "int(0..2)", Pike_sp+1-args,
- "Unknown mutex locking style: %"PRINTPIKEINT"d\n",type);
+ bad_arg_error("trylock", Pike_sp-args, args, 2, "int(0..2)", Pike_sp+1-args,
+ "Unknown mutex locking style: %"PRINTPIKEINT"d\n",type);
case 0:
if(m->key && OB2KEY(m->key)->owner == Pike_interpreter.thread_state)
@@ -2505,18 +2505,18 @@ void f_cond_wait(INT32 args)
if (args <= 2) {
FLOAT_TYPE fsecs = 0.0;
- get_all_args("condition->wait", args, "%o.%F", &key, &fsecs);
+ get_all_args("wait", args, "%o.%F", &key, &fsecs);
seconds = (INT_TYPE) fsecs;
nanos = (INT_TYPE)((fsecs - seconds)*1000000000);
} else {
/* FIXME: Support bignum nanos. */
- get_all_args("condition->wait", args, "%o%i%i", &key, &seconds, &nanos);
+ get_all_args("wait", args, "%o%i%i", &key, &seconds, &nanos);
}
if ((key->prog != mutex_key) ||
(!(OB2KEY(key)->initialized)) ||
(!(mut = OB2KEY(key)->mut))) {
- Pike_error("Bad argument 1 to condition->wait()\n");
+ Pike_error("Bad argument 1 to wait()\n");
}
if(args > 1) {