From 76f746e3fb9e30f13b04fb1e0e9485158cbdab07 Mon Sep 17 00:00:00 2001 From: Martin Nilsson <nilsson@opera.com> Date: Mon, 26 May 2014 18:37:00 +0200 Subject: [PATCH] Fixed some misfirings from Pers script. --- src/backend.cmod | 2 +- src/modules/DVB/dvb.c | 2 +- src/modules/Image/encodings/png.c | 11 ++++----- src/modules/Image/encodings/ras.c | 3 +-- src/modules/Image/encodings/x.c | 12 ++++------ src/modules/Image/encodings/xcf.c | 3 +-- src/modules/Image/image.c | 3 +-- src/modules/Java/jvm.c | 2 +- src/modules/Mysql/mysql.c | 16 ++++++------- src/modules/Odbc/odbc_result.c | 3 +-- src/modules/Postgres/pgresult.c | 2 +- src/modules/_Image_GIF/image_gif.c | 28 ++++++++--------------- src/modules/_Image_TIFF/image_tiff.c | 8 +++---- src/modules/_Image_TTF/image_ttf.c | 12 ++++------ src/modules/_Image_XFace/image_xface.c | 3 +-- src/modules/_Stdio/file.c | 3 ++- src/modules/_Stdio/sendfile.c | 9 +++----- src/modules/_WhiteFish/resultset.h | 2 +- src/post_modules/GTK2/source/gtkimage.pre | 2 +- src/post_modules/GTK2/source/support.c | 5 ++-- 20 files changed, 52 insertions(+), 79 deletions(-) diff --git a/src/backend.cmod b/src/backend.cmod index 360c50ab91..8c0aefbd55 100644 --- a/src/backend.cmod +++ b/src/backend.cmod @@ -4318,7 +4318,7 @@ static void check_set_timer(struct timeval tmp) if (!loc.o->prog) { - Pike_error("Cannot access storage of destructed parent object.\n") ; + Pike_error ("Cannot access storage of destructed parent object.\n"); } _st = get_storage(loc.o, PollDeviceBackend_program); diff --git a/src/modules/DVB/dvb.c b/src/modules/DVB/dvb.c index e6ade42cb9..03c4181cad 100644 --- a/src/modules/DVB/dvb.c +++ b/src/modules/DVB/dvb.c @@ -1282,7 +1282,7 @@ static void f_stream_create(INT32 args) { dvbprog = Pike_sp[-1].u.object; Pike_sp--; - if( !dvbprog || !(dvbstor =get_storage( dvbprog, dvb_program )) ) + if( !dvbprog || !(dvbstor = get_storage( dvbprog, dvb_program )) ) Pike_error("This class cannot be instantiated directly\n"); devname = mk_devname(DVB->cardn, DEMUXDEVICE); diff --git a/src/modules/Image/encodings/png.c b/src/modules/Image/encodings/png.c index 4dab16b146..b61b886046 100644 --- a/src/modules/Image/encodings/png.c +++ b/src/modules/Image/encodings/png.c @@ -1181,7 +1181,7 @@ static void img_png_decode(INT32 args, int mode) push_object(clone_object(image_colortable_program,1)); ct=get_storage(sp[-1].u.object, - image_colortable_program); + image_colortable_program); if (!ct) PIKE_ERROR("Image.PNG._decode", "Internal error: cloned colortable isn't colortable.\n", sp, args); @@ -1281,8 +1281,7 @@ static void img_png_decode(INT32 args, int mode) if (ihdr.type==3) { - ct= - get_storage(sp[-1].u.object,image_colortable_program); + ct=get_storage(sp[-1].u.object,image_colortable_program); mapping_string_insert(m, param_palette, sp-1); } else @@ -1567,8 +1566,7 @@ static void image_png_encode(INT32 args) SIMPLE_TOO_FEW_ARGS_ERROR("Image.PNG.encode", 1); if (TYPEOF(sp[-args]) != T_OBJECT || - !(img= - get_storage(sp[-args].u.object,image_program))) + !(img=get_storage(sp[-args].u.object,image_program))) SIMPLE_BAD_ARG_ERROR("Image.PNG.encode", 1, "Image.Image"); if (!img->img) @@ -1611,8 +1609,7 @@ static void image_png_encode(INT32 args) if (s && !(TYPEOF(*s) == T_INT && s->u.integer==0)) if (TYPEOF(*s) != T_OBJECT || - !(ct= - get_storage(s->u.object,image_colortable_program))) + !(ct=get_storage(s->u.object,image_colortable_program))) PIKE_ERROR("Image.PNG.encode", "Option (arg 2) \"palette\" has illegal type.\n", sp, args); diff --git a/src/modules/Image/encodings/ras.c b/src/modules/Image/encodings/ras.c index 38874ac0d3..0396bf4293 100644 --- a/src/modules/Image/encodings/ras.c +++ b/src/modules/Image/encodings/ras.c @@ -445,8 +445,7 @@ static void img_ras_encode(INT32 args) if((s=simple_mapping_string_lookup(optm, "palette"))!=NULL && !UNSAFE_IS_ZERO(s)) if(TYPEOF(*s) != T_OBJECT || - (ct= - get_storage(s->u.object, image_colortable_program))==NULL) + (ct=get_storage(s->u.object, image_colortable_program))==NULL) Pike_error("Image.RAS.encode: option (arg 2) \"palette\" has illegal type\n"); } diff --git a/src/modules/Image/encodings/x.c b/src/modules/Image/encodings/x.c index 1ee33ae775..05517ed074 100644 --- a/src/modules/Image/encodings/x.c +++ b/src/modules/Image/encodings/x.c @@ -149,8 +149,7 @@ static void image_x_encode_truecolor(INT32 args) Pike_error("Image.X.encode_truecolor: illegal argument 1 (expected image object)\n"); if (args>10) if (TYPEOF(sp[10-args]) != T_OBJECT || - !(nct= - get_storage(sp[10-args].u.object,image_colortable_program))) + !(nct=get_storage(sp[10-args].u.object,image_colortable_program))) Pike_error("Image.X.encode_truecolor: illegal argument 10 (expected colortable object)\n"); if (TYPEOF(sp[1-args]) != T_INT) @@ -752,8 +751,7 @@ void image_x_encode_pseudocolor(INT32 args) !(img=get_storage(sp[-args].u.object,image_program))) Pike_error("Image.X.encode_pseudocolor: illegal argument 1 (expected image object)\n"); if (TYPEOF(sp[4-args]) != T_OBJECT || - !(nct= - get_storage(sp[4-args].u.object,image_colortable_program))) + !(nct=get_storage(sp[4-args].u.object,image_colortable_program))) Pike_error("Image.X.encode_pseudocolor: illegal argument 4 (expected colortable object)\n"); if (args>5) { @@ -832,8 +830,7 @@ static void image_x_decode_truecolor(INT32 args) if (args>12) { if (TYPEOF(sp[12-args]) != T_OBJECT || - !(nct= - get_storage(sp[12-args].u.object,image_colortable_program))) + !(nct=get_storage(sp[12-args].u.object,image_colortable_program))) Pike_error("Image.X.decode_truecolor: illegal argument 13, expected colortable\n"); if (nct->type!=NCT_FLAT) Pike_error("Image.X.decode_truecolor: illegal argument 13, expected colortable in flat mode\n"); @@ -1048,8 +1045,7 @@ void image_x_decode_pseudocolor(INT32 args) if (TYPEOF(sp[i-args]) != T_INT) Pike_error("Image.X.decode_pseudocolor: illegal argument %d\n",i+1); if (TYPEOF(sp[6-args]) != T_OBJECT || - !(nct= - get_storage(ncto=sp[6-args].u.object,image_colortable_program))) + !(nct=get_storage(ncto=sp[6-args].u.object,image_colortable_program))) Pike_error("Image.X.decode_pseudocolor: illegal argument 7\n"); if (nct->type!=NCT_FLAT) diff --git a/src/modules/Image/encodings/xcf.c b/src/modules/Image/encodings/xcf.c index 135b8ecf63..10817ecaa2 100644 --- a/src/modules/Image/encodings/xcf.c +++ b/src/modules/Image/encodings/xcf.c @@ -1191,8 +1191,7 @@ void image_xcf_f__decode_tiles( INT32 args ) Pike_error("Wrong type object argument 2 (image)\n"); if( cmapo && - !(cmap=get_storage(cmapo, - image_colortable_program))) + !(cmap=get_storage(cmapo, image_colortable_program))) Pike_error("Wrong type object argument 4 (colortable)\n"); for(l=0; l<(unsigned int)tiles->size; l++) diff --git a/src/modules/Image/image.c b/src/modules/Image/image.c index 9da556be8a..b3d4d148fb 100644 --- a/src/modules/Image/image.c +++ b/src/modules/Image/image.c @@ -2372,8 +2372,7 @@ void image_color(INT32 args) if (args>0 && TYPEOF(sp[-args]) == T_INT) rgb.r=rgb.b=rgb.g=sp[-args].u.integer; else if (args>0 && TYPEOF(sp[-args]) == T_OBJECT && - (cs =get_storage(sp[-args].u.object, - image_color_program))) + (cs =get_storage(sp[-args].u.object, image_color_program))) rgb.r=cs->rgb.r, rgb.g=cs->rgb.g, rgb.b=cs->rgb.b; diff --git a/src/modules/Java/jvm.c b/src/modules/Java/jvm.c index a9486c381b..217bc0ee32 100644 --- a/src/modules/Java/jvm.c +++ b/src/modules/Java/jvm.c @@ -3354,7 +3354,7 @@ static void f_monitor_create(INT32 args) get_all_args("Java.monitor->create()", args, "%o", &obj); - if == NULL) + if(get_storage(obj, jobj_program) == NULL) Pike_error("Bad argument 1 to create().\n"); #ifdef _REENTRANT diff --git a/src/modules/Mysql/mysql.c b/src/modules/Mysql/mysql.c index 2ddf128783..a2d09d1414 100644 --- a/src/modules/Mysql/mysql.c +++ b/src/modules/Mysql/mysql.c @@ -1164,8 +1164,8 @@ static void low_query(INT32 args, char *name, int flags) } /* Set the result. */ - if ((!(res = - get_storage(o, mysql_result_program))) || res->result) { + if ((!(res = get_storage(o, mysql_result_program))) || + res->result) { mysql_free_result(result); Pike_error("%s(): Bad mysql result object!\n", name); } @@ -1550,8 +1550,8 @@ static void f_list_dbs(INT32 args) push_object(o = clone_object(mysql_result_program, 1)); /* Set the result. */ - if ((!(res = - get_storage(o, mysql_result_program))) || res->result) { + if ((!(res = get_storage(o, mysql_result_program))) || + res->result) { mysql_free_result(result); Pike_error("Mysql.mysql->list_dbs(): Bad mysql result object!\n"); } @@ -1624,8 +1624,8 @@ static void f_list_tables(INT32 args) push_object(o = clone_object(mysql_result_program, 1)); /* Set the result. */ - if ((!(res = - get_storage(o, mysql_result_program))) || res->result) { + if ((!(res = get_storage(o, mysql_result_program))) || + res->result) { mysql_free_result(result); Pike_error("Mysql.mysql->list_tables(): Bad mysql result object!\n"); } @@ -1811,8 +1811,8 @@ static void f_list_processes(INT32 args) push_object(o = clone_object(mysql_result_program, 1)); /* Set the result. */ - if ((!(res = - get_storage(o, mysql_result_program))) || res->result) { + if ((!(res = get_storage(o, mysql_result_program))) || + res->result) { mysql_free_result(result); Pike_error("Mysql.mysql->list_processes(): Bad mysql result object!\n"); } diff --git a/src/modules/Odbc/odbc_result.c b/src/modules/Odbc/odbc_result.c index 9ad179aa01..54bbac41ee 100644 --- a/src/modules/Odbc/odbc_result.c +++ b/src/modules/Odbc/odbc_result.c @@ -385,8 +385,7 @@ static void f_create(INT32 args) } if ((TYPEOF(Pike_sp[-args]) != T_OBJECT) || (!(PIKE_ODBC_RES->odbc = - get_storage(Pike_sp[-args].u.object, - odbc_program)))) { + get_storage(Pike_sp[-args].u.object, odbc_program)))) { Pike_error("Bad argument 1 to odbc_result()\n"); } add_ref(PIKE_ODBC_RES->obj = Pike_sp[-args].u.object); diff --git a/src/modules/Postgres/pgresult.c b/src/modules/Postgres/pgresult.c index 6318be23b8..b955d9285c 100644 --- a/src/modules/Postgres/pgresult.c +++ b/src/modules/Postgres/pgresult.c @@ -170,7 +170,7 @@ static void f_create (INT32 args) { char *storage; check_all_args("postgres_result->create",args,BIT_OBJECT,0); - pgdebug("result->f_create.\n",args); + pgdebug("result->f_create(%d).\n",args); storage=get_storage(Pike_sp[-args].u.object,postgres_program); if (!storage) diff --git a/src/modules/_Image_GIF/image_gif.c b/src/modules/_Image_GIF/image_gif.c index 2dc40b6431..69cb54ef8e 100644 --- a/src/modules/_Image_GIF/image_gif.c +++ b/src/modules/_Image_GIF/image_gif.c @@ -211,8 +211,7 @@ void image_gif_header_block(INT32 args) globalpalette=0; } else if (TYPEOF(sp[2-args]) == T_OBJECT && - (nct= - get_storage(sp[2-args].u.object,image_colortable_program))) + (nct=get_storage(sp[2-args].u.object,image_colortable_program))) { numcolors=image_colortable_size(nct); globalpalette=1; @@ -738,8 +737,7 @@ CHRONO("gif render_block begin"); else if (!img->img) Pike_error("Image.GIF.render_block(): given image has no image\n"); if (TYPEOF(sp[1-args]) != T_OBJECT || - !(nct= - get_storage(sp[1-args].u.object,image_colortable_program))) + !(nct=get_storage(sp[1-args].u.object,image_colortable_program))) Pike_error("Image.GIF.render_block(): Illegal argument 2 (expected colortable object)\n"); if (args>=4) @@ -1050,8 +1048,7 @@ void _image_gif_encode(INT32 args,int fs) ref_push_object(imgobj); push_int(n); nctobj=clone_object(image_colortable_program,2); - nct= - get_storage(nctobj,image_colortable_program); + nct=get_storage(nctobj,image_colortable_program); if (!nct) Pike_error("Image.GIF.encode(): Internal error; colortable isn't colortable\n"); arg=2; @@ -1060,8 +1057,7 @@ void _image_gif_encode(INT32 args,int fs) } else if (TYPEOF(sp[1-args]) != T_OBJECT) Pike_error("Image.GIF.encode(): Illegal argument 2 (expected image or colortable object or int)\n"); - else if ((nct= - get_storage(nctobj=sp[1-args].u.object,image_colortable_program))) + else if ((nct=get_storage(nctobj=sp[1-args].u.object,image_colortable_program))) { add_ref(nctobj); } @@ -1074,8 +1070,7 @@ void _image_gif_encode(INT32 args,int fs) /* check transparency arguments */ if (args-arg>0) { if (TYPEOF(sp[arg-args]) == T_OBJECT && - (alpha= - get_storage(alphaobj=sp[arg-args].u.object,image_program))) + (alpha=get_storage(alphaobj=sp[arg-args].u.object,image_program))) { add_ref(alphaobj); if (args-arg>1) { @@ -1121,8 +1116,7 @@ void _image_gif_encode(INT32 args,int fs) push_object(imgobj); push_int(256); nctobj=clone_object(image_colortable_program,2); - nct= - get_storage(nctobj,image_colortable_program); + nct=get_storage(nctobj,image_colortable_program); if (!nct) Pike_error("Image.GIF.encode(): Internal error; colortable isn't colortable\n"); } @@ -1143,8 +1137,7 @@ void _image_gif_encode(INT32 args,int fs) ref_push_object(imgobj); if (alpha) push_int(255); else push_int(256); nctobj=clone_object(image_colortable_program,2); - nct= - get_storage(nctobj,image_colortable_program); + nct=get_storage(nctobj,image_colortable_program); if (!nct) Pike_error("Image.GIF.encode(): Internal error; colortable isn't colortable\n"); } @@ -2097,7 +2090,7 @@ void image_gif_decode(INT32 args) { if (TYPEOF(b->item[4]) == T_OBJECT) alpha=get_storage(b->item[4].u.object, - image_program); + image_program); else alpha=NULL; @@ -2183,7 +2176,7 @@ void image_gif_decode_layers(INT32 args) { if (TYPEOF(b->item[4]) == T_OBJECT) alpha=get_storage(b->item[4].u.object, - image_program); + image_program); else alpha=NULL; @@ -2311,8 +2304,7 @@ void image_gif__encode_render(INT32 args) { struct neo_colortable *nct; - nct= - get_storage(a->item[4].u.object,image_colortable_program); + nct=get_storage(a->item[4].u.object,image_colortable_program); if (!nct) { free_array(a); diff --git a/src/modules/_Image_TIFF/image_tiff.c b/src/modules/_Image_TIFF/image_tiff.c index 7cedc1158c..b9df05f0d5 100644 --- a/src/modules/_Image_TIFF/image_tiff.c +++ b/src/modules/_Image_TIFF/image_tiff.c @@ -277,7 +277,7 @@ void low_image_tiff_encode( struct buffer *buf, int x, y; char *b; - i = (get_storage(img->img,image_program)); + i = get_storage(img->img,image_program); if(!i) Pike_error("Image is not an image object.\n"); @@ -285,7 +285,7 @@ void low_image_tiff_encode( struct buffer *buf, if(img->alpha) { spp++; - a = (get_storage(img->alpha,image_program)); + a = get_storage(img->alpha,image_program); if(!a) Pike_error("Alpha is not an image object.\n"); if(i->xsize != a->xsize || @@ -464,9 +464,9 @@ void low_image_tiff_decode( struct buffer *buf, push_int(w); push_int(h); res->alpha = clone_object(image_program, 2); - da = (get_storage(res->alpha,image_program))->img; + da = get_storage(res->alpha,image_program)->img; } - di = (get_storage(res->img,image_program))->img; + di = get_storage(res->img,image_program)->img; for(i=0; i<h*w; i++) { diff --git a/src/modules/_Image_TTF/image_ttf.c b/src/modules/_Image_TTF/image_ttf.c index 7e0f031adb..247d5e5f18 100644 --- a/src/modules/_Image_TTF/image_ttf.c +++ b/src/modules/_Image_TTF/image_ttf.c @@ -682,8 +682,7 @@ static void image_ttf_faceinstance_create(INT32 args) Pike_error("Image.TTF.FaceInstance(): too few arguments\n"); if (TYPEOF(sp[-args]) != T_OBJECT || - !(face_s= - get_storage(sp[-args].u.object,image_ttf_face_program))) + !(face_s=get_storage(sp[-args].u.object,image_ttf_face_program))) Pike_error("Image.TTF.FaceInstance(): illegal argument 1\n"); if ((res=TT_New_Instance(face_s->face,&(face_i->instance)))) @@ -712,8 +711,7 @@ static void image_ttf_faceinstance_set_height(INT32 args) Pike_error("Image.TTF.FaceInstance->set_height(): illegal argument 1\n"); if (h<1) h=1; - if (!(face_s= - get_storage(THISi->faceobj,image_ttf_face_program))) + if (!(face_s=get_storage(THISi->faceobj,image_ttf_face_program))) Pike_error("Image.TTF.FaceInstance->write(): lost Face\n"); ttf_instance_setc(face_s,face_i,h,"Image.TTF.FaceInstance->set_height()"); @@ -835,8 +833,7 @@ static void image_ttf_faceinstance_ponder(INT32 args) int xmin=1000,xmax=-1000,pos=0; - if (!(face_s= - get_storage(THISi->faceobj,image_ttf_face_program))) + if (!(face_s=get_storage(THISi->faceobj,image_ttf_face_program))) Pike_error("Image.TTF.FaceInstance->ponder(): lost Face\n"); if (args && TYPEOF(sp[-1]) == T_INT) @@ -989,8 +986,7 @@ static void image_ttf_faceinstance_write(INT32 args) unsigned char* pixmap; int maxcharwidth = 0; - if (!(face_s= - get_storage(THISi->faceobj,image_ttf_face_program))) + if (!(face_s=get_storage(THISi->faceobj,image_ttf_face_program))) Pike_error("Image.TTF.FaceInstance->write(): lost Face\n"); if(!TT_Get_Kerning_Directory( face_s->face, &kerning )) diff --git a/src/modules/_Image_XFace/image_xface.c b/src/modules/_Image_XFace/image_xface.c index 8fdaa2e824..015ff447ea 100644 --- a/src/modules/_Image_XFace/image_xface.c +++ b/src/modules/_Image_XFace/image_xface.c @@ -436,8 +436,7 @@ static void image_xface_encode(INT32 args) if (args<1 || TYPEOF(sp[-args]) != T_OBJECT - || !(img= - get_storage(sp[-args].u.object,image_program)) + || !(img=get_storage(sp[-args].u.object,image_program)) || (args>1 && TYPEOF(sp[1-args]) != T_MAPPING)) Pike_error("Image.XFace.encode: Illegal arguments\n"); diff --git a/src/modules/_Stdio/file.c b/src/modules/_Stdio/file.c index a8c5bd508f..30532d5e49 100644 --- a/src/modules/_Stdio/file.c +++ b/src/modules/_Stdio/file.c @@ -275,7 +275,8 @@ static void debug_check_internals (struct my_file *f) { size_t ev; - if ) + if (f->box.ref_obj->prog && file_program && + !get_storage(f->box.ref_obj,file_program) ) Pike_fatal ("ref_obj is not a file object.\n"); for (ev = 0; ev < NELEM (f->event_cbs); ev++) diff --git a/src/modules/_Stdio/sendfile.c b/src/modules/_Stdio/sendfile.c index 950fab41ab..a7c0550d84 100644 --- a/src/modules/_Stdio/sendfile.c +++ b/src/modules/_Stdio/sendfile.c @@ -918,8 +918,7 @@ static void sf_create(INT32 args) /* Check that we're called with the right kind of objects. */ if (sf.to_file->prog == file_program) { sf.to = (struct my_file *)(sf.to_file->storage); - } else if (!(sf.to = get_storage(sf.to_file, - file_program))) { + } else if (!(sf.to = get_storage(sf.to_file, file_program))) { struct svalue *sval; if (!(sval = get_storage(sf.to_file, file_ref_program)) || (TYPEOF(*sval) != T_OBJECT) || @@ -955,11 +954,9 @@ static void sf_create(INT32 args) if (sf.from_file) { if (sf.from_file->prog == file_program) { sf.from = (struct my_file *)(sf.from_file->storage); - } else if (!(sf.from = get_storage(sf.from_file, - file_program))) { + } else if (!(sf.from = get_storage(sf.from_file, file_program))) { struct svalue *sval; - if (!(sval = get_storage(sf.from_file, - file_ref_program)) || + if (!(sval = get_storage(sf.from_file, file_ref_program)) || !(TYPEOF(*sval) != T_OBJECT) || !(sf.from = get_storage(sval->u.object, file_program))) { SIMPLE_BAD_ARG_ERROR("sendfile", 2, "object(Stdio.File)"); diff --git a/src/modules/_WhiteFish/resultset.h b/src/modules/_WhiteFish/resultset.h index ee32d154ac..52be1fb935 100644 --- a/src/modules/_WhiteFish/resultset.h +++ b/src/modules/_WhiteFish/resultset.h @@ -9,7 +9,7 @@ typedef struct result_set #ifdef PIKE_DEBUG extern struct program *resultset_program; struct object *wf_not_resultset( struct object *o ); -# define WF_RESULTSET(X) ()?X:wf_not_resultset(X)) +# define WF_RESULTSET(X) ((X&&get_storage(X,resultset_program))?X:wf_not_resultset(X)) #else # define WF_RESULTSET(X) X #endif diff --git a/src/post_modules/GTK2/source/gtkimage.pre b/src/post_modules/GTK2/source/gtkimage.pre index e31128cb3e..7983c4ce6e 100644 --- a/src/post_modules/GTK2/source/gtkimage.pre +++ b/src/post_modules/GTK2/source/gtkimage.pre @@ -197,7 +197,7 @@ mapping(string:mixed) get_icon_name() PGTK_PUSH_GCHAR(icon_name); ref_push_string(_STR("size")); push_int(size); - f_aggregate_mapping; + f_aggregate_mapping(4); } } endrequire; diff --git a/src/post_modules/GTK2/source/support.c b/src/post_modules/GTK2/source/support.c index d0df00fd97..35ac6e34d9 100644 --- a/src/post_modules/GTK2/source/support.c +++ b/src/post_modules/GTK2/source/support.c @@ -309,7 +309,7 @@ void *get_pgdk2object(struct object *from, struct program *type) { void *f; if (!from) return NULL; - if(type) + if (type) f=get_storage( from, type ); else f=from->storage; /* Add a warning? */ @@ -319,8 +319,7 @@ void *get_pgdk2object(struct object *from, struct program *type) { } void pgtk2_destruct(struct object *o) { - struct object_wrapper *ow= - get_storage(o,pg2_object_program); + struct object_wrapper *ow=get_storage(o,pg2_object_program); if (ow) /* This should always be true. But let's add a check anyway. */ ow->obj=NULL; if (o->refs>1) -- GitLab