Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit3535ebc

Browse files
Harmonize parameter names in ecpg code.
Make ecpg function declarations consistently use named parameters. Alsomake sure that the declarations use names that match corresponding namesfrom function definitions.Like other recent commits that cleaned up function parameter names, thiscommit was written with help from clang-tidy.Author: Peter Geoghegan <pg@bowt.ie>Reviewed-By: David Rowley <dgrowleyml@gmail.com>Discussion:https://postgr.es/m/CAH2-WznJt9CMM9KJTMjJh_zbL5hD9oX44qdJ4aqZtjFi-zA3Tg@mail.gmail.com
1 parent163b099 commit3535ebc

File tree

18 files changed

+271
-233
lines changed

18 files changed

+271
-233
lines changed

‎src/interfaces/ecpg/ecpglib/ecpglib_extern.h‎

Lines changed: 47 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -172,52 +172,68 @@ boolecpg_get_data(const PGresult *, int, int, int, enum ECPGttype type,
172172
#ifdefENABLE_THREAD_SAFETY
173173
voidecpg_pthreads_init(void);
174174
#endif
175-
structconnection*ecpg_get_connection(constchar*);
176-
char*ecpg_alloc(long,int);
177-
char*ecpg_auto_alloc(long,int);
178-
char*ecpg_realloc(void*,long,int);
179-
voidecpg_free(void*);
180-
boolecpg_init(conststructconnection*,constchar*,constint);
181-
char*ecpg_strdup(constchar*,int);
182-
constchar*ecpg_type_name(enumECPGttype);
183-
intecpg_dynamic_type(Oid);
184-
intsqlda_dynamic_type(Oid,enumCOMPAT_MODE);
175+
structconnection*ecpg_get_connection(constchar*connection_name);
176+
char*ecpg_alloc(longsize,intlineno);
177+
char*ecpg_auto_alloc(longsize,intlineno);
178+
char*ecpg_realloc(void*ptr,longsize,intlineno);
179+
voidecpg_free(void*ptr);
180+
boolecpg_init(conststructconnection*con,
181+
constchar*connection_name,
182+
constintlineno);
183+
char*ecpg_strdup(constchar*string,intlineno);
184+
constchar*ecpg_type_name(enumECPGttypetyp);
185+
intecpg_dynamic_type(Oidtype);
186+
intsqlda_dynamic_type(Oidtype,enumCOMPAT_MODEcompat);
185187
voidecpg_clear_auto_mem(void);
186188

187189
structdescriptor*ecpg_find_desc(intline,constchar*name);
188190

189-
structprepared_statement*ecpg_find_prepared_statement(constchar*,
190-
structconnection*,structprepared_statement**);
191+
structprepared_statement*ecpg_find_prepared_statement(constchar*name,
192+
structconnection*con,
193+
structprepared_statement**prev_);
191194

192195
boolecpg_store_result(constPGresult*results,intact_field,
193196
conststructstatement*stmt,structvariable*var);
194-
boolecpg_store_input(constint,constbool,conststructvariable*,char**,bool);
197+
boolecpg_store_input(constintlineno,constboolforce_indicator,
198+
conststructvariable*var,
199+
char**tobeinserted_p,boolquote);
195200
voidecpg_free_params(structstatement*stmt,boolprint);
196-
boolecpg_do_prologue(int,constint,constint,constchar*,constbool,
197-
enumECPG_statement_type,constchar*,va_list,
198-
structstatement**);
199-
boolecpg_build_params(structstatement*);
201+
boolecpg_do_prologue(intlineno,constintcompat,
202+
constintforce_indicator,constchar*connection_name,
203+
constboolquestionmarks,enumECPG_statement_typestatement_type,
204+
constchar*query,va_listargs,
205+
structstatement**stmt_out);
206+
boolecpg_build_params(structstatement*stmt);
200207
boolecpg_autostart_transaction(structstatement*stmt);
201208
boolecpg_execute(structstatement*stmt);
202-
boolecpg_process_output(structstatement*,bool);
203-
voidecpg_do_epilogue(structstatement*);
204-
boolecpg_do(constint,constint,constint,constchar*,constbool,
205-
constint,constchar*,va_list);
206-
207-
boolecpg_check_PQresult(PGresult*,int,PGconn*,enumCOMPAT_MODE);
209+
boolecpg_process_output(structstatement*stmt,boolclear_result);
210+
voidecpg_do_epilogue(structstatement*stmt);
211+
boolecpg_do(constintlineno,constintcompat,
212+
constintforce_indicator,constchar*connection_name,
213+
constboolquestionmarks,constintst,constchar*query,
214+
va_listargs);
215+
216+
boolecpg_check_PQresult(PGresult*results,intlineno,
217+
PGconn*connection,enumCOMPAT_MODEcompat);
208218
voidecpg_raise(intline,intcode,constchar*sqlstate,constchar*str);
209219
voidecpg_raise_backend(intline,PGresult*result,PGconn*conn,intcompat);
210-
char*ecpg_prepared(constchar*,structconnection*);
211-
boolecpg_deallocate_all_conn(intlineno,enumCOMPAT_MODEc,structconnection*conn);
220+
char*ecpg_prepared(constchar*name,structconnection*con);
221+
boolecpg_deallocate_all_conn(intlineno,enumCOMPAT_MODEc,structconnection*con);
212222
voidecpg_log(constchar*format,...)pg_attribute_printf(1,2);
213-
boolecpg_auto_prepare(int,constchar*,constint,char**,constchar*);
214-
boolecpg_register_prepared_stmt(structstatement*);
223+
boolecpg_auto_prepare(intlineno,constchar*connection_name,
224+
constintcompat,char**name,constchar*query);
225+
boolecpg_register_prepared_stmt(structstatement*stmt);
215226
voidecpg_init_sqlca(structsqlca_t*sqlca);
216227

217-
structsqlda_compat*ecpg_build_compat_sqlda(int,PGresult*,int,enumCOMPAT_MODE);
218-
voidecpg_set_compat_sqlda(int,structsqlda_compat**,constPGresult*,int,enumCOMPAT_MODE);
219-
structsqlda_struct*ecpg_build_native_sqlda(int,PGresult*,int,enumCOMPAT_MODE);
220-
voidecpg_set_native_sqlda(int,structsqlda_struct**,constPGresult*,int,enumCOMPAT_MODE);
228+
structsqlda_compat*ecpg_build_compat_sqlda(intline,PGresult*res,introw,
229+
enumCOMPAT_MODEcompat);
230+
voidecpg_set_compat_sqlda(intlineno,structsqlda_compat**_sqlda,
231+
constPGresult*res,introw,
232+
enumCOMPAT_MODEcompat);
233+
structsqlda_struct*ecpg_build_native_sqlda(intline,PGresult*res,introw,
234+
enumCOMPAT_MODEcompat);
235+
voidecpg_set_native_sqlda(intlineno,structsqlda_struct**_sqlda,
236+
constPGresult*res,introw,enumCOMPAT_MODEcompat);
221237
unsignedecpg_hex_dec_len(unsignedsrclen);
222238
unsignedecpg_hex_enc_len(unsignedsrclen);
223239
unsignedecpg_hex_encode(constchar*src,unsignedlen,char*dst);

‎src/interfaces/ecpg/include/ecpg_informix.h‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -33,55 +33,55 @@ extern "C"
3333
{
3434
#endif
3535

36-
externintrdatestr(date,char*);
37-
externvoidrtoday(date*);
38-
externintrjulmdy(date,short*);
39-
externintrdefmtdate(date*,constchar*,constchar*);
40-
externintrfmtdate(date,constchar*,char*);
41-
externintrmdyjul(short*,date*);
42-
externintrstrdate(constchar*,date*);
43-
externintrdayofweek(date);
36+
externintrdatestr(dated,char*str);
37+
externvoidrtoday(date*d);
38+
externintrjulmdy(dated,short*mdy);
39+
externintrdefmtdate(date*d,constchar*fmt,constchar*str);
40+
externintrfmtdate(dated,constchar*fmt,char*str);
41+
externintrmdyjul(short*mdy,date*d);
42+
externintrstrdate(constchar*str,date*d);
43+
externintrdayofweek(dated);
4444

45-
externintrfmtlong(long,constchar*,char*);
46-
externintrgetmsg(int,char*,int);
47-
externintrisnull(int,constchar*);
48-
externintrsetnull(int,char*);
49-
externintrtypalign(int,int);
50-
externintrtypmsize(int,int);
51-
externintrtypwidth(int,int);
52-
externvoidrupshift(char*);
45+
externintrfmtlong(longlng_val,constchar*fmt,char*outbuf);
46+
externintrgetmsg(intmsgnum,char*s,intmaxsize);
47+
externintrisnull(intt,constchar*ptr);
48+
externintrsetnull(intt,char*ptr);
49+
externintrtypalign(intoffset,inttype);
50+
externintrtypmsize(inttype,intlen);
51+
externintrtypwidth(intsqltype,intsqllen);
52+
externvoidrupshift(char*str);
5353

54-
externintbyleng(char*,int);
55-
externvoidldchar(char*,int,char*);
54+
externintbyleng(char*str,intlen);
55+
externvoidldchar(char*src,intlen,char*dest);
5656

57-
externvoidECPG_informix_set_var(int,void*,int);
58-
externvoid*ECPG_informix_get_var(int);
57+
externvoidECPG_informix_set_var(intnumber,void*pointer,intlineno);
58+
externvoid*ECPG_informix_get_var(intnumber);
5959
externvoidECPG_informix_reset_sqlca(void);
6060

6161
/* Informix defines these in decimal.h */
62-
intdecadd(decimal*,decimal*,decimal*);
63-
intdeccmp(decimal*,decimal*);
64-
voiddeccopy(decimal*,decimal*);
65-
intdeccvasc(constchar*,int,decimal*);
66-
intdeccvdbl(double,decimal*);
67-
intdeccvint(int,decimal*);
68-
intdeccvlong(long,decimal*);
69-
intdecdiv(decimal*,decimal*,decimal*);
70-
intdecmul(decimal*,decimal*,decimal*);
71-
intdecsub(decimal*,decimal*,decimal*);
72-
intdectoasc(decimal*,char*,int,int);
73-
intdectodbl(decimal*,double*);
74-
intdectoint(decimal*,int*);
75-
intdectolong(decimal*,long*);
62+
intdecadd(decimal*arg1,decimal*arg2,decimal*sum);
63+
intdeccmp(decimal*arg1,decimal*arg2);
64+
voiddeccopy(decimal*src,decimal*target);
65+
intdeccvasc(constchar*cp,intlen,decimal*np);
66+
intdeccvdbl(doubledbl,decimal*np);
67+
intdeccvint(intin,decimal*np);
68+
intdeccvlong(longlng,decimal*np);
69+
intdecdiv(decimal*n1,decimal*n2,decimal*result);
70+
intdecmul(decimal*n1,decimal*n2,decimal*result);
71+
intdecsub(decimal*n1,decimal*n2,decimal*result);
72+
intdectoasc(decimal*np,char*cp,intlen,intright);
73+
intdectodbl(decimal*np,double*dblp);
74+
intdectoint(decimal*np,int*ip);
75+
intdectolong(decimal*np,long*lngp);
7676

7777
/* Informix defines these in datetime.h */
78-
externvoiddtcurrent(timestamp*);
79-
externintdtcvasc(char*,timestamp*);
80-
externintdtsub(timestamp*,timestamp*,interval*);
81-
externintdttoasc(timestamp*,char*);
82-
externintdttofmtasc(timestamp*,char*,int,char*);
83-
externintintoasc(interval*,char*);
84-
externintdtcvfmtasc(char*,char*,timestamp*);
78+
externvoiddtcurrent(timestamp*ts);
79+
externintdtcvasc(char*str,timestamp*ts);
80+
externintdtsub(timestamp*ts1,timestamp*ts2,interval*iv);
81+
externintdttoasc(timestamp*ts,char*output);
82+
externintdttofmtasc(timestamp*ts,char*output,intstr_len,char*fmtstr);
83+
externintintoasc(interval*i,char*str);
84+
externintdtcvfmtasc(char*inbuf,char*fmtstr,timestamp*dtvalue);
8585

8686
#ifdef__cplusplus
8787
}

‎src/interfaces/ecpg/include/ecpglib.h‎

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -49,20 +49,24 @@ extern "C"
4949
{
5050
#endif
5151

52-
voidECPGdebug(int,FILE*);
53-
boolECPGstatus(int,constchar*);
54-
boolECPGsetcommit(int,constchar*,constchar*);
55-
boolECPGsetconn(int,constchar*);
56-
boolECPGconnect(int,int,constchar*,constchar*,constchar*,constchar*,int);
57-
boolECPGdo(constint,constint,constint,constchar*,constbool,constint,constchar*,...);
58-
boolECPGtrans(int,constchar*,constchar*);
59-
boolECPGdisconnect(int,constchar*);
60-
boolECPGprepare(int,constchar*,constbool,constchar*,constchar*);
61-
boolECPGdeallocate(int,int,constchar*,constchar*);
62-
boolECPGdeallocate_all(int,int,constchar*);
63-
char*ECPGprepared_statement(constchar*,constchar*,int);
64-
PGconn*ECPGget_PGconn(constchar*);
65-
PGTransactionStatusTypeECPGtransactionStatus(constchar*);
52+
voidECPGdebug(intn,FILE*dbgs);
53+
boolECPGstatus(intlineno,constchar*connection_name);
54+
boolECPGsetcommit(intlineno,constchar*mode,constchar*connection_name);
55+
boolECPGsetconn(intlineno,constchar*connection_name);
56+
boolECPGconnect(intlineno,intc,constchar*name,constchar*user,
57+
constchar*passwd,constchar*connection_name,intautocommit);
58+
boolECPGdo(constintlineno,constintcompat,constintforce_indicator,
59+
constchar*connection_name,constboolquestionmarks,
60+
constintst,constchar*query,...);
61+
boolECPGtrans(intlineno,constchar*connection_name,constchar*transaction);
62+
boolECPGdisconnect(intlineno,constchar*connection_name);
63+
boolECPGprepare(intlineno,constchar*connection_name,constboolquestionmarks,
64+
constchar*name,constchar*variable);
65+
boolECPGdeallocate(intlineno,intc,constchar*connection_name,constchar*name);
66+
boolECPGdeallocate_all(intlineno,intcompat,constchar*connection_name);
67+
char*ECPGprepared_statement(constchar*connection_name,constchar*name,intlineno);
68+
PGconn*ECPGget_PGconn(constchar*connection_name);
69+
PGTransactionStatusTypeECPGtransactionStatus(constchar*connection_name);
6670

6771
/* print an error message */
6872
voidsqlprint(void);
@@ -74,19 +78,21 @@ voidsqlprint(void);
7478

7579
/* dynamic SQL */
7680

77-
boolECPGdo_descriptor(int,constchar*,constchar*,constchar*);
78-
boolECPGdeallocate_desc(int,constchar*);
79-
boolECPGallocate_desc(int,constchar*);
80-
boolECPGget_desc_header(int,constchar*,int*);
81-
boolECPGget_desc(int,constchar*,int,...);
82-
boolECPGset_desc_header(int,constchar*,int);
83-
boolECPGset_desc(int,constchar*,int,...);
84-
85-
voidECPGset_noind_null(enumECPGttype,void*);
86-
boolECPGis_noind_null(enumECPGttype,constvoid*);
87-
boolECPGdescribe(int,int,bool,constchar*,constchar*,...);
88-
89-
voidECPGset_var(int,void*,int);
81+
boolECPGdo_descriptor(intline,constchar*connection,
82+
constchar*descriptor,constchar*query);
83+
boolECPGdeallocate_desc(intline,constchar*name);
84+
boolECPGallocate_desc(intline,constchar*name);
85+
boolECPGget_desc_header(intlineno,constchar*desc_name,int*count);
86+
boolECPGget_desc(intlineno,constchar*desc_name,intindex,...);
87+
boolECPGset_desc_header(intlineno,constchar*desc_name,intcount);
88+
boolECPGset_desc(intlineno,constchar*desc_name,intindex,...);
89+
90+
voidECPGset_noind_null(enumECPGttypetype,void*ptr);
91+
boolECPGis_noind_null(enumECPGttypetype,constvoid*ptr);
92+
boolECPGdescribe(intline,intcompat,boolinput,
93+
constchar*connection_name,constchar*stmt_name,...);
94+
95+
voidECPGset_var(intnumber,void*pointer,intlineno);
9096
void*ECPGget_var(intnumber);
9197

9298
/* dynamic result allocation */

‎src/interfaces/ecpg/include/pgtypes_date.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ extern "C"
1414
#endif
1515

1616
externdate*PGTYPESdate_new(void);
17-
externvoidPGTYPESdate_free(date*);
18-
externdatePGTYPESdate_from_asc(char*,char**);
19-
externchar*PGTYPESdate_to_asc(date);
20-
externdatePGTYPESdate_from_timestamp(timestamp);
21-
externvoidPGTYPESdate_julmdy(date,int*);
22-
externvoidPGTYPESdate_mdyjul(int*,date*);
23-
externintPGTYPESdate_dayofweek(date);
24-
externvoidPGTYPESdate_today(date*);
25-
externintPGTYPESdate_defmt_asc(date*,constchar*,constchar*);
26-
externintPGTYPESdate_fmt_asc(date,constchar*,char*);
17+
externvoidPGTYPESdate_free(date*d);
18+
externdatePGTYPESdate_from_asc(char*str,char**endptr);
19+
externchar*PGTYPESdate_to_asc(datedDate);
20+
externdatePGTYPESdate_from_timestamp(timestampdt);
21+
externvoidPGTYPESdate_julmdy(datejd,int*mdy);
22+
externvoidPGTYPESdate_mdyjul(int*mdy,date*jdate);
23+
externintPGTYPESdate_dayofweek(datedDate);
24+
externvoidPGTYPESdate_today(date*d);
25+
externintPGTYPESdate_defmt_asc(date*d,constchar*fmt,constchar*str);
26+
externintPGTYPESdate_fmt_asc(datedDate,constchar*fmtstring,char*outbuf);
2727

2828
#ifdef__cplusplus
2929
}

‎src/interfaces/ecpg/include/pgtypes_interval.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ extern "C"
3636
#endif
3737

3838
externinterval*PGTYPESinterval_new(void);
39-
externvoidPGTYPESinterval_free(interval*);
40-
externinterval*PGTYPESinterval_from_asc(char*,char**);
41-
externchar*PGTYPESinterval_to_asc(interval*);
42-
externintPGTYPESinterval_copy(interval*,interval*);
39+
externvoidPGTYPESinterval_free(interval*intvl);
40+
externinterval*PGTYPESinterval_from_asc(char*str,char**endptr);
41+
externchar*PGTYPESinterval_to_asc(interval*span);
42+
externintPGTYPESinterval_copy(interval*intvlsrc,interval*intvldest);
4343

4444
#ifdef__cplusplus
4545
}

‎src/interfaces/ecpg/include/pgtypes_numeric.h‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -43,24 +43,24 @@ extern "C"
4343

4444
numeric*PGTYPESnumeric_new(void);
4545
decimal*PGTYPESdecimal_new(void);
46-
voidPGTYPESnumeric_free(numeric*);
47-
voidPGTYPESdecimal_free(decimal*);
48-
numeric*PGTYPESnumeric_from_asc(char*,char**);
49-
char*PGTYPESnumeric_to_asc(numeric*,int);
50-
intPGTYPESnumeric_add(numeric*,numeric*,numeric*);
51-
intPGTYPESnumeric_sub(numeric*,numeric*,numeric*);
52-
intPGTYPESnumeric_mul(numeric*,numeric*,numeric*);
53-
intPGTYPESnumeric_div(numeric*,numeric*,numeric*);
54-
intPGTYPESnumeric_cmp(numeric*,numeric*);
55-
intPGTYPESnumeric_from_int(signedint,numeric*);
56-
intPGTYPESnumeric_from_long(signed longint,numeric*);
57-
intPGTYPESnumeric_copy(numeric*,numeric*);
58-
intPGTYPESnumeric_from_double(double,numeric*);
59-
intPGTYPESnumeric_to_double(numeric*,double*);
60-
intPGTYPESnumeric_to_int(numeric*,int*);
61-
intPGTYPESnumeric_to_long(numeric*,long*);
62-
intPGTYPESnumeric_to_decimal(numeric*,decimal*);
63-
intPGTYPESnumeric_from_decimal(decimal*,numeric*);
46+
voidPGTYPESnumeric_free(numeric*var);
47+
voidPGTYPESdecimal_free(decimal*var);
48+
numeric*PGTYPESnumeric_from_asc(char*str,char**endptr);
49+
char*PGTYPESnumeric_to_asc(numeric*num,intdscale);
50+
intPGTYPESnumeric_add(numeric*var1,numeric*var2,numeric*result);
51+
intPGTYPESnumeric_sub(numeric*var1,numeric*var2,numeric*result);
52+
intPGTYPESnumeric_mul(numeric*var1,numeric*var2,numeric*result);
53+
intPGTYPESnumeric_div(numeric*var1,numeric*var2,numeric*result);
54+
intPGTYPESnumeric_cmp(numeric*var1,numeric*var2);
55+
intPGTYPESnumeric_from_int(signedintint_val,numeric*var);
56+
intPGTYPESnumeric_from_long(signed longintlong_val,numeric*var);
57+
intPGTYPESnumeric_copy(numeric*src,numeric*dst);
58+
intPGTYPESnumeric_from_double(doubled,numeric*dst);
59+
intPGTYPESnumeric_to_double(numeric*nv,double*dp);
60+
intPGTYPESnumeric_to_int(numeric*nv,int*ip);
61+
intPGTYPESnumeric_to_long(numeric*nv,long*lp);
62+
intPGTYPESnumeric_to_decimal(numeric*src,decimal*dst);
63+
intPGTYPESnumeric_from_decimal(decimal*src,numeric*dst);
6464

6565
#ifdef__cplusplus
6666
}

‎src/interfaces/ecpg/include/pgtypes_timestamp.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ extern "C"
1515
{
1616
#endif
1717

18-
externtimestampPGTYPEStimestamp_from_asc(char*,char**);
19-
externchar*PGTYPEStimestamp_to_asc(timestamp);
20-
externintPGTYPEStimestamp_sub(timestamp*,timestamp*,interval*);
21-
externintPGTYPEStimestamp_fmt_asc(timestamp*,char*,int,constchar*);
22-
externvoidPGTYPEStimestamp_current(timestamp*);
23-
externintPGTYPEStimestamp_defmt_asc(constchar*,constchar*,timestamp*);
18+
externtimestampPGTYPEStimestamp_from_asc(char*str,char**endptr);
19+
externchar*PGTYPEStimestamp_to_asc(timestamptstamp);
20+
externintPGTYPEStimestamp_sub(timestamp*ts1,timestamp*ts2,interval*iv);
21+
externintPGTYPEStimestamp_fmt_asc(timestamp*ts,char*output,intstr_len,constchar*fmtstr);
22+
externvoidPGTYPEStimestamp_current(timestamp*ts);
23+
externintPGTYPEStimestamp_defmt_asc(constchar*str,constchar*fmt,timestamp*d);
2424
externintPGTYPEStimestamp_add_interval(timestamp*tin,interval*span,timestamp*tout);
2525
externintPGTYPEStimestamp_sub_interval(timestamp*tin,interval*span,timestamp*tout);
2626

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp