Skip to content

P
proview
Commit d4d91f6f authored by Claes Sjofors's avatar Claes Sjofors
Browse files
Options

Script int type change from int to long int

parent 02fbc042
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 743 additions and 735 deletions
src/lib/co/src/co_ccm.c
View file @ d4d91f6f
This diff is collapsed.
src/lib/co/src/co_ccm.h
View file @ d4d91f6f
......@@ -33,25 +33,31 @@ extern "C" {
#define K_STRING_SIZE 400
typedef long int ccm_tInt;
typedef float ccm_tFloat;
typedef char ccm_tString[K_STRING_SIZE];
#define ccm_cIntFormat "%ld"
typedef struct s_arg_ {
char value_name[80];
int value_decl;
long int value_int;
float value_float;
char value_string[K_STRING_SIZE];
ccm_tInt value_int;
ccm_tFloat value_float;
ccm_tString value_string;
int value_type;
int var_decl;
char var_name[32];
long int value_returned;
struct s_arg_ *next;
} ccm_s_arg;
} ccm_sArg;
int ccm_register_function(
const char *name,
int (* sysfunc) ( void *, ccm_s_arg *, int, int *, float *,
int *, char *)
int (* sysfunc) ( void *, ccm_sArg *, int, int *, ccm_tFloat *,
ccm_tInt *, char *)
);
int ccm_file_exec(
......@@ -72,32 +78,32 @@ int ccm_file_exec(
int ccm_create_external_var(
const char *name,
int decl,
float value_float,
int value_int,
char *value_string
ccm_tFloat value_float,
ccm_tInt value_int,
char *value_string
);
int ccm_delete_external_var(
const char *name,
float value_float,
int value_int,
char *value_string
ccm_tFloat value_float,
ccm_tInt value_int,
char *value_string
);
int ccm_set_external_var(
const char *name,
int decl,
float value_float,
int value_int,
char *value_string
ccm_tFloat value_float,
ccm_tInt value_int,
char *value_string
);
int ccm_get_external_var(
const char *name,
int decl,
float *value_float,
int *value_int,
char *value_string
ccm_tFloat *value_float,
ccm_tInt *value_int,
char *value_string
);
int ccm_ref_external_var(
......
src/lib/rt/src/rt_rtt_cmdmode.c
View file @ d4d91f6f
......@@ -697,8 +697,8 @@ static int rtt_symbol_to_float( float *float_value, char *value)
int rtt_attribute_func (
char *name,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string
)
{
......@@ -712,9 +712,9 @@ int rtt_attribute_func (
char *t;
int len;
int decl;
int int_val;
float float_val;
char string_val[80];
ccm_tInt int_val;
ccm_tFloat float_val;
ccm_tString string_val;
pwr_sAttrRef attrref;
pwr_tTypeId attrtype;
unsigned int attrsize, attroffs, attrelem;
......@@ -912,9 +912,9 @@ static int rtt_get_attr_value(
char *value)
{
int sts;
int return_int;
float return_float;
char return_string[80];
ccm_tInt return_int;
ccm_tFloat return_float;
ccm_tString return_string;
int decl;
sts = rtt_attribute_func( attrname, &decl, &return_float, &return_int,
......@@ -924,7 +924,7 @@ static int rtt_get_attr_value(
switch ( decl)
{
case CCM_DECL_INT:
sprintf( value, "%d", return_int);
sprintf( value, ccm_cIntFormat, return_int);
break;
case CCM_DECL_FLOAT:
......@@ -932,12 +932,12 @@ static int rtt_get_attr_value(
if ( fabs( return_float - floor( return_float)) <= FLT_EPSILON)
{
return_int = return_float + FLT_EPSILON;
sprintf( value, "%d", return_int);
sprintf( value, ccm_cIntFormat, return_int);
}
else if ( fabs( return_float - floor( return_float) + 1) <= FLT_EPSILON)
{
return_int = return_float + FLT_EPSILON;
sprintf( value, "%d", return_int);
sprintf( value, ccm_cIntFormat, return_int);
}
else
sprintf( value, "%f", return_float);
......
src/lib/rt/src/rt_rtt_command.c
View file @ d4d91f6f
......@@ -7753,14 +7753,14 @@ static int rtt_deffilename_func( char *outfile, char *infile, void *client_data)
static int rtt_getinput_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
ccm_s_arg *arg_p, *arg_p2, *arg_p3;
ccm_sArg *arg_p, *arg_p2, *arg_p3;
int maxlen = 79;
char input_str[80];
int sts;
......@@ -7843,14 +7843,14 @@ static int rtt_getinput_func(
static int rtt_placecursor_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
ccm_s_arg *arg_p2;
ccm_sArg *arg_p2;
if ( arg_count != 2)
return CCM__ARGMISM;
......@@ -7873,11 +7873,11 @@ static int rtt_placecursor_func(
static int rtt_lineerase_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
......@@ -7895,11 +7895,11 @@ static int rtt_lineerase_func(
static int rtt_getcurrenttitle_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
menu_ctx ctx;
......@@ -7926,11 +7926,11 @@ static int rtt_getcurrenttitle_func(
static int rtt_getcurrenttext_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
menu_ctx ctx;
......@@ -7979,11 +7979,11 @@ static int rtt_getcurrenttext_func(
static int rtt_getcurrentobject_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
menu_ctx ctx;
......@@ -8015,11 +8015,11 @@ static int rtt_getcurrentobject_func(
static int rtt_getchild_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -8051,11 +8051,11 @@ static int rtt_getchild_func(
static int rtt_getparent_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -8087,11 +8087,11 @@ static int rtt_getparent_func(
static int rtt_getnextsibling_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -8123,11 +8123,11 @@ static int rtt_getnextsibling_func(
static int rtt_getclasslist_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -8159,11 +8159,11 @@ static int rtt_getclasslist_func(
static int rtt_getrootlist_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -8188,11 +8188,11 @@ static int rtt_getrootlist_func(
static int rtt_getnodeobject_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -8217,11 +8217,11 @@ static int rtt_getnodeobject_func(
static int rtt_getnextobject_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -8254,11 +8254,11 @@ static int rtt_getnextobject_func(
static int rtt_getobjectclass_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -8286,11 +8286,11 @@ static int rtt_getobjectclass_func(
static int rtt_messageerror_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
......@@ -8310,11 +8310,11 @@ static int rtt_messageerror_func(
static int rtt_messageinfo_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
......@@ -8334,14 +8334,14 @@ static int rtt_messageinfo_func(
static int rtt_cutobjectname_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
ccm_s_arg *arg_p2;
ccm_sArg *arg_p2;
if ( arg_count != 2)
return CCM__ARGMISM;
......@@ -8363,19 +8363,19 @@ static int rtt_cutobjectname_func(
static int rtt_getattribute_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
ccm_s_arg *arg_p2;
ccm_sArg *arg_p2;
int sts;
int value_decl;
int value_int;
float value_float;
char value_string[80];
ccm_tInt value_int;
ccm_tFloat value_float;
ccm_tString value_string;
if ( !(arg_count == 2 || arg_count == 1))
return CCM__ARGMISM;
......
src/lib/rt/src/rt_rtt_functions.h
View file @ d4d91f6f
......@@ -20,6 +20,8 @@
#ifndef rt_rtt_functions_h
#define rt_rtt_functions_h
#include "co_ccm.h"
/* Module rt_rtt_menu.c */
int rtt_gdh_init( void);
......@@ -817,8 +819,8 @@ int rtt_define_symbol( char *key, char *arg1, char *arg2, char *arg3);
int rtt_attribute_func (
char *name,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string);
/* Module rt_rtt_rtc.c */
......
wb/lib/wb/src/wb_wccm.cpp
View file @ d4d91f6f
......@@ -52,8 +52,8 @@ int (* wccm_get_ldhsession_cb)( void *, ldh_tSesContext *);
static int wccm_attribute_func (
char *name,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string
);
static int wccm_cut_segments (
......@@ -104,19 +104,19 @@ int wccm_get_wbctx( ldh_tWBContext *wbctx)
static int wccm_getattribute_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
ccm_s_arg *arg_p2;
ccm_sArg *arg_p2;
int sts;
int value_decl;
int value_int;
float value_float;
char value_string[80];
ccm_tInt value_int;
ccm_tFloat value_float;
ccm_tString value_string;
if ( !(arg_count == 2 || arg_count == 1))
return CCM__ARGMISM;
......@@ -169,11 +169,11 @@ static int wccm_getattribute_func(
static int wccm_getchild_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -216,11 +216,11 @@ static int wccm_getchild_func(
static int wccm_getparent_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -264,11 +264,11 @@ static int wccm_getparent_func(
static int wccm_getnextsibling_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -312,11 +312,11 @@ static int wccm_getnextsibling_func(
static int wccm_getclasslist_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -360,11 +360,11 @@ static int wccm_getclasslist_func(
static int wccm_getnextobject_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -408,11 +408,11 @@ static int wccm_getnextobject_func(
static int wccm_getclasslistattrref_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -454,11 +454,11 @@ static int wccm_getclasslistattrref_func(
static int wccm_getnextattrref_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -468,7 +468,7 @@ static int wccm_getnextattrref_func(
int size;
ldh_tSesContext ldhses;
pwr_tCid cid;
ccm_s_arg *arg_p2;
ccm_sArg *arg_p2;
sts = wccm_get_ldhses( &ldhses);
if ( EVEN(sts))
......@@ -509,11 +509,11 @@ static int wccm_getnextattrref_func(
static int wccm_getrootlist_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -549,11 +549,11 @@ static int wccm_getrootlist_func(
static int wccm_getobjectclass_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -596,11 +596,11 @@ static int wccm_getobjectclass_func(
static int wccm_objectexist_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -630,11 +630,11 @@ static int wccm_objectexist_func(
static int wccm_getvolumelist_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -670,11 +670,11 @@ static int wccm_getvolumelist_func(
static int wccm_getnextvolume_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -718,11 +718,11 @@ static int wccm_getnextvolume_func(
static int wccm_getvolumeclass_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -765,14 +765,14 @@ static int wccm_getvolumeclass_func(
static int wccm_cutobjectname_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
ccm_s_arg *arg_p2;
ccm_sArg *arg_p2;
if ( arg_count != 2)
return CCM__ARGMISM;
......@@ -794,11 +794,11 @@ static int wccm_cutobjectname_func(
static int wccm_getnodeobject_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -843,11 +843,11 @@ static int wccm_getnodeobject_func(
static int wccm_getprojectname_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -868,14 +868,14 @@ static int wccm_getprojectname_func(
static int wccm_setattribute_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
ccm_s_arg *arg_p2;
ccm_sArg *arg_p2;
int sts;
char buf[400];
pwr_tAName name;
......@@ -926,11 +926,11 @@ static int wccm_setattribute_func(
static int wccm_checksystemgroup_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -950,11 +950,11 @@ static int wccm_checksystemgroup_func(
static int wccm_getnextfreeuservid_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -985,11 +985,11 @@ static int wccm_getnextfreeuservid_func(
static int wccm_checknewvid_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -1013,11 +1013,11 @@ static int wccm_checknewvid_func(
static int wccm_checknewvolumename_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -1041,11 +1041,11 @@ static int wccm_checknewvolumename_func(
static int wccm_getcurrentvolume_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -1088,11 +1088,11 @@ static int wccm_getcurrentvolume_func(
static int wccm_stringtoobjectname_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
if ( arg_count != 1)
......@@ -1110,11 +1110,11 @@ static int wccm_stringtoobjectname_func(
static int wccm_gethardware_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
if ( arg_count != 0)
......@@ -1251,8 +1251,8 @@ void wccm_set_status( pwr_tStatus sts)
static int wccm_attribute_func (
char *name,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string
)
{
......
wb/lib/wb/src/wb_wnav_command.cpp
View file @ d4d91f6f
......@@ -5305,11 +5305,11 @@ int WNav::command( char* input_str)
static int wnav_getcurrenttext_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
WNav *wnav;
......@@ -5342,11 +5342,11 @@ static int wnav_getcurrenttext_func(
static int wnav_getcurrentobject_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
WNav *wnav;
......@@ -5384,11 +5384,11 @@ static int wnav_getcurrentobject_func(
static int wnav_getcurrentvolume_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
WNav *wnav;
......@@ -5428,11 +5428,11 @@ static int wnav_getcurrentvolume_func(
static int wnav_messageerror_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
WNav *wnav;
......@@ -5454,11 +5454,11 @@ static int wnav_messageerror_func(
static int wnav_messageinfo_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
WNav *wnav;
......@@ -5480,11 +5480,11 @@ static int wnav_messageinfo_func(
static int wnav_isw1_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
WNav *wnav;
......@@ -5503,11 +5503,11 @@ static int wnav_isw1_func(
static int wnav_isw2_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
WNav *wnav;
......@@ -5526,11 +5526,11 @@ static int wnav_isw2_func(
static int wnav_editmode_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
WNav *wnav;
......@@ -5549,15 +5549,15 @@ static int wnav_editmode_func(
static int wnav_setdialogsize_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
WNav *wnav;
ccm_s_arg *arg_p2, *arg_p3, *arg_p4;
ccm_sArg *arg_p2, *arg_p3, *arg_p4;
if ( arg_count != 4)
return CCM__ARGMISM;
......@@ -5588,15 +5588,15 @@ static int wnav_setdialogsize_func(
static int wnav_messagedialog_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
WNav *wnav;
ccm_s_arg *arg_p2;
ccm_sArg *arg_p2;
if ( arg_count != 2)
return CCM__ARGMISM;
......@@ -5622,15 +5622,15 @@ static int wnav_messagedialog_func(
static int wnav_confirmdialog_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
WNav *wnav;
ccm_s_arg *arg_p2, *arg_p3;
ccm_sArg *arg_p2, *arg_p3;
int sts;
int cancel;
char str[80];
......@@ -5712,15 +5712,15 @@ static int wnav_confirmdialog_func(
static int wnav_continuedialog_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
WNav *wnav;
ccm_s_arg *arg_p2;
ccm_sArg *arg_p2;
int sts;
char str[80];
......@@ -5756,15 +5756,15 @@ static int wnav_continuedialog_func(
static int wnav_promptdialog_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
WNav *wnav;
ccm_s_arg *arg_p2, *arg_p3;
ccm_sArg *arg_p2, *arg_p3;
int sts;
char *value;
char str[80];
......@@ -5806,16 +5806,16 @@ static int wnav_promptdialog_func(
static int wnav_opengraph_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
WNav *wnav;
ccm_s_arg *arg_p2;
ccm_s_arg *arg_p3;
ccm_sArg *arg_p2;
ccm_sArg *arg_p3;
int sts;
pwr_tCmd cmd;
......@@ -5857,11 +5857,11 @@ static int wnav_opengraph_func(
static int wnav_closegraph_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
WNav *wnav;
......@@ -5891,17 +5891,17 @@ static int wnav_closegraph_func(
static int wnav_setsubwindow_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
WNav *wnav;
ccm_s_arg *arg_p2;
ccm_s_arg *arg_p3;
ccm_s_arg *arg_p4;
ccm_sArg *arg_p2;
ccm_sArg *arg_p3;
ccm_sArg *arg_p4;
int sts;
pwr_tCmd cmd;
......
xtt/lib/ge/src/ge_graph.cpp
View file @ d4d91f6f
......@@ -4355,11 +4355,11 @@ int Graph::ccm_get_variable( char *name, int type, void *data)
case pwr_eType_Int32:
case pwr_eType_Boolean:
ccm_type = CCM_DECL_INT;
sts = ccm_get_external_var( name, ccm_type, 0, (int *)data, 0);
sts = ccm_get_external_var( name, ccm_type, 0, (ccm_tInt *)data, 0);
return sts;
case pwr_eType_Float32:
ccm_type = CCM_DECL_FLOAT;
sts = ccm_get_external_var( name, ccm_type, (float *)data, 0, 0);
sts = ccm_get_external_var( name, ccm_type, (ccm_tFloat *)data, 0, 0);
return sts;
case pwr_eType_String:
ccm_type = CCM_DECL_STRING;
......
xtt/lib/ge/src/ge_graph_command.cpp
View file @ d4d91f6f
......@@ -2536,18 +2536,18 @@ int Graph::command( char* input_str)
static int graph_gettextextent_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
ccm_s_arg *arg_p2; // Textsize
ccm_s_arg *arg_p3; // Bold
ccm_s_arg *arg_p4; // Width
ccm_s_arg *arg_p5; // Height
ccm_s_arg *arg_p6; // Descent
ccm_sArg *arg_p2; // Textsize
ccm_sArg *arg_p3; // Bold
ccm_sArg *arg_p4; // Width
ccm_sArg *arg_p5; // Height
ccm_sArg *arg_p6; // Descent
Graph *graph;
glow_eDrawType draw_type;
double z_width, z_height, z_descent;
......@@ -2618,11 +2618,11 @@ static int graph_gettextextent_func(
static int graph_selectadd_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
Graph *graph;
......@@ -2641,11 +2641,11 @@ static int graph_selectadd_func(
static int graph_getcurrentobject_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
Graph *graph;
......@@ -2663,11 +2663,11 @@ static int graph_getcurrentobject_func(
static int graph_setextern_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
Graph *graph;
......@@ -2698,11 +2698,11 @@ static int graph_setextern_func(
static int graph_setintern_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
Graph *graph;
......
xtt/lib/xtt/src/xtt_xnav_command.cpp
View file @ d4d91f6f
......@@ -133,8 +133,8 @@ static int xnav_ge_is_authorized_cb( void *xnav, unsigned int access);
static int xnav_attribute_func (
char *name,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string);
static int xnav_ge_command_cb( XttGe *gectx, char *command);
static void xnav_ge_close_cb( XttGe *gectx);
......@@ -5472,11 +5472,11 @@ int XNav::command( char* input_str)
static int xnav_getcurrenttext_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
XNav *xnav;
......@@ -5505,11 +5505,11 @@ static int xnav_getcurrenttext_func(
static int xnav_getcurrentobject_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
XNav *xnav;
......@@ -5536,11 +5536,11 @@ static int xnav_getcurrentobject_func(
static int xnav_getchild_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -5572,11 +5572,11 @@ static int xnav_getchild_func(
static int xnav_getparent_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -5608,11 +5608,11 @@ static int xnav_getparent_func(
static int xnav_getnextsibling_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -5644,11 +5644,11 @@ static int xnav_getnextsibling_func(
static int xnav_getclasslist_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -5680,11 +5680,11 @@ static int xnav_getclasslist_func(
static int xnav_getrootlist_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -5709,11 +5709,11 @@ static int xnav_getrootlist_func(
static int xnav_getnodeobject_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -5738,11 +5738,11 @@ static int xnav_getnodeobject_func(
static int xnav_getnextobject_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -5775,11 +5775,11 @@ static int xnav_getnextobject_func(
static int xnav_getobjectclass_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
int sts;
......@@ -5810,11 +5810,11 @@ static int xnav_getobjectclass_func(
static int xnav_messageerror_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
XNav *xnav;
......@@ -5836,11 +5836,11 @@ static int xnav_messageerror_func(
static int xnav_messageinfo_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
XNav *xnav;
......@@ -5862,14 +5862,14 @@ static int xnav_messageinfo_func(
static int xnav_cutobjectname_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
ccm_s_arg *arg_p2;
ccm_sArg *arg_p2;
if ( arg_count != 2)
return CCM__ARGMISM;
......@@ -5891,19 +5891,19 @@ static int xnav_cutobjectname_func(
static int xnav_getattribute_func(
void *filectx,
ccm_s_arg *arg_list,
ccm_sArg *arg_list,
int arg_count,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string)
{
ccm_s_arg *arg_p2;
ccm_sArg *arg_p2;
int sts;
int value_decl;
int value_int;
float value_float;
char value_string[80];
ccm_tInt value_int;
ccm_tFloat value_float;
ccm_tString value_string;
if ( !(arg_count == 2 || arg_count == 1))
return CCM__ARGMISM;
......@@ -6093,8 +6093,8 @@ int xnav_cut_segments (
static int xnav_attribute_func (
char *name,
int *return_decl,
float *return_float,
int *return_int,
ccm_tFloat *return_float,
ccm_tInt *return_int,
char *return_string
)
{
......@@ -6107,9 +6107,9 @@ static int xnav_attribute_func (
char *t;
int len;
int decl;
int int_val;
float float_val;
char string_val[80];
ccm_tInt int_val;
ccm_tFloat float_val;
ccm_tString string_val;
pwr_sAttrRef attrref;
pwr_tTypeId attrtype;
unsigned int attrsize, attroffs, attrelem;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7