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

Commit9feeef9

Browse files
committed
ecpg: Move function prototype into header file
PGTYPEStimestamp_defmt_scan() was declared twice inside different .cfiles, with slightly different prototypes. Move it into a header fileand correct the prototype.
1 parent2f1fa75 commit9feeef9

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

‎src/interfaces/ecpg/pgtypeslib/dt.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,10 @@ voidGetCurrentDateTime(struct tm *);
348348
intdate2j(int,int,int);
349349
voidTrimTrailingZeros(char*);
350350
voiddt2time(double,int*,int*,int*,fsec_t*);
351+
intPGTYPEStimestamp_defmt_scan(char**str,char*fmt,timestamp*d,
352+
int*year,int*month,int*day,
353+
int*hour,int*minute,int*second,
354+
int*tz);
351355

352356
externchar*pgtypes_date_weekdays_short[];
353357
externchar*pgtypes_date_months[];

‎src/interfaces/ecpg/pgtypeslib/dt_common.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2595,9 +2595,6 @@ pgtypes_defmt_scan(union un_fmt_comb * scan_val, int scan_type, char **pstr, cha
25952595
}
25962596

25972597
/* XXX range checking */
2598-
intPGTYPEStimestamp_defmt_scan(char**,char*,timestamp*,int*,int*,int*,
2599-
int*,int*,int*,int*);
2600-
26012598
int
26022599
PGTYPEStimestamp_defmt_scan(char**str,char*fmt,timestamp*d,
26032600
int*year,int*month,int*day,

‎src/interfaces/ecpg/pgtypeslib/timestamp.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
#include"pgtypes_date.h"
1919

2020

21-
intPGTYPEStimestamp_defmt_scan(char**,constchar*,timestamp*,int*,int*,int*,
22-
int*,int*,int*,int*);
23-
2421
#ifdefHAVE_INT64_TIMESTAMP
2522
staticint64
2623
time2t(constinthour,constintmin,constintsec,constfsec_tfsec)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp