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

Commita58825a

Browse files
author
Thomas G. Lockhart
committed
Add declarations for text, bpchar, and varchar length functions.
Remove declarations in builtins.h duplicated in dt.h.Change a few return type declarations to use "type *" rather than "struct ...".
1 parent3551ee0 commita58825a

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

‎src/include/utils/builtins.h

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: builtins.h,v 1.30 1997/11/15 16:32:15 momjian Exp $
9+
* $Id: builtins.h,v 1.31 1997/12/16 15:55:14 thomas Exp $
1010
*
1111
* NOTES
1212
* This should normally only be included by fmgr.h.
@@ -264,13 +264,6 @@ extern AbsoluteTime intervalend(TimeInterval i);
264264
externintisreltime(char*timestring);
265265
externtext*timeofday(void);
266266

267-
/* dt.c */
268-
externDateTime*datetime_in(char*str);
269-
externchar*datetime_out(DateTime*datetime);
270-
externTimeSpan*timespan_in(char*str);
271-
externchar*timespan_out(TimeSpan*timespan);
272-
externintdatetime2tm(DateTimedt,int*tzp,structtm*tm,double*fsec,char**tzn);
273-
274267
/* filename.c */
275268
externchar*filename_in(char*file);
276269
externchar*filename_out(char*s);
@@ -454,38 +447,43 @@ time_tdatetime_stamp(DateTime *datetime);
454447
/* varchar.c */
455448
externchar*bpcharin(char*s,intdummy,inttyplen);
456449
externchar*bpcharout(char*s);
457-
externchar*varcharin(char*s,intdummy,inttyplen);
458-
externchar*varcharout(char*s);
459450
externboolbpchareq(char*arg1,char*arg2);
460451
externboolbpcharne(char*arg1,char*arg2);
461452
externboolbpcharlt(char*arg1,char*arg2);
462453
externboolbpcharle(char*arg1,char*arg2);
463454
externboolbpchargt(char*arg1,char*arg2);
464455
externboolbpcharge(char*arg1,char*arg2);
465456
externint32bpcharcmp(char*arg1,char*arg2);
457+
externint32bpcharlen(char*arg);
458+
externuint32hashbpchar(structvarlena*key);
459+
460+
externchar*varcharin(char*s,intdummy,inttyplen);
461+
externchar*varcharout(char*s);
466462
externboolvarchareq(char*arg1,char*arg2);
467463
externboolvarcharne(char*arg1,char*arg2);
468464
externboolvarcharlt(char*arg1,char*arg2);
469465
externboolvarcharle(char*arg1,char*arg2);
470466
externboolvarchargt(char*arg1,char*arg2);
471467
externboolvarcharge(char*arg1,char*arg2);
472468
externint32varcharcmp(char*arg1,char*arg2);
473-
externuint32hashbpchar(structvarlena*key);
469+
externint32varcharlen(char*arg);
474470
externuint32hashvarchar(structvarlena*key);
475471

476472
/* varlena.c */
477-
externstructvarlena*byteain(char*inputText);
478-
externchar*byteaout(structvarlena*vlena);
479-
externstructvarlena*textin(char*inputText);
480-
externchar*textout(structvarlena*vlena);
481-
externtext*textcat(text*t1,text*t2);
473+
externtext*textin(char*inputText);
474+
externchar*textout(structvarlena*vlena);
475+
externtext*textcat(text*arg1,text*arg2);
482476
externbooltexteq(structvarlena*arg1,structvarlena*arg2);
483477
externbooltextne(structvarlena*arg1,structvarlena*arg2);
484478
externbooltext_lt(structvarlena*arg1,structvarlena*arg2);
485479
externbooltext_le(structvarlena*arg1,structvarlena*arg2);
486480
externbooltext_gt(structvarlena*arg1,structvarlena*arg2);
487481
externbooltext_ge(structvarlena*arg1,structvarlena*arg2);
488-
externint32textpos(text*t1,text*t2);
482+
externint32textlen(text*arg);
483+
externint32textpos(text*arg1,text*arg2);
484+
485+
externstructvarlena*byteain(char*inputText);
486+
externchar*byteaout(structvarlena*vlena);
489487
externint32byteaGetSize(structvarlena*v);
490488
externint32byteaGetByte(structvarlena*v,int32n);
491489
externint32byteaGetBit(structvarlena*v,int32n);

‎src/include/utils/dt.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
* Copyright (c) 1994, Regents of the University of California
1010
*
11-
* $Id: dt.h,v 1.22 1997/11/17 16:39:58 thomas Exp $
11+
* $Id: dt.h,v 1.23 1997/12/16 15:55:17 thomas Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -283,6 +283,7 @@ extern bool timespan_lt(TimeSpan *span1, TimeSpan *span2);
283283
externbooltimespan_le(TimeSpan*span1,TimeSpan*span2);
284284
externbooltimespan_ge(TimeSpan*span1,TimeSpan*span2);
285285
externbooltimespan_gt(TimeSpan*span1,TimeSpan*span2);
286+
externbooltimespan_finite(TimeSpan*span);
286287
externinttimespan_cmp(TimeSpan*span1,TimeSpan*span2);
287288
externTimeSpan*timespan_smaller(TimeSpan*span1,TimeSpan*span2);
288289
externTimeSpan*timespan_larger(TimeSpan*span1,TimeSpan*span2);
@@ -309,6 +310,7 @@ extern TimeSpan *datetime_age(DateTime *dt1, DateTime *dt2);
309310
externvoidGetCurrentTime(structtm*tm);
310311
externDateTimeSetDateTime(DateTimedatetime);
311312
externinttm2datetime(structtm*tm,doublefsec,int*tzp,DateTime*dt);
313+
externintdatetime2tm(DateTimedt,int*tzp,structtm*tm,double*fsec,char**tzn);
312314

313315
externvoidj2date(intjd,int*year,int*month,int*day);
314316
externintdate2j(intyear,intmonth,intday);
@@ -335,4 +337,4 @@ extern intEncodeTimeOnly(struct tm * tm, double fsec, int style, char *str);
335337
externintEncodeDateTime(structtm*tm,doublefsec,int*tzp,char**tzn,intstyle,char*str);
336338
externintEncodeTimeSpan(structtm*tm,doublefsec,intstyle,char*str);
337339

338-
#endif/* DT_H */
340+
#endif/* DT_H */

0 commit comments

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