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

Commit433c213

Browse files
committed
Update pgeasy.
1 parentbf919ed commit433c213

File tree

9 files changed

+18
-396
lines changed

9 files changed

+18
-396
lines changed

‎src/interfaces/libpgeasy/Makefile.in

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for pgeasy library
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile.in,v 1.2 1999/10/11 18:16:06 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile.in,v 1.3 1999/10/11 18:51:09 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -15,11 +15,13 @@ SO_MINOR_VERSION= 0
1515
SRCDIR= @top_srcdir@
1616
include$(SRCDIR)/Makefile.global
1717

18+
CFLAGS+= -I$(LIBPQDIR)
19+
1820
ifdefKRBVERS
1921
CFLAGS+=$(KRBFLAGS)
2022
endif
2123

22-
OBJS=pgeasy.o halt.o
24+
OBJS=libpgeasy.o halt.o
2325

2426
SHLIB_LINK+= -L../libpq -lpq
2527

@@ -38,9 +40,9 @@ include $(SRCDIR)/Makefile.shlib
3840

3941
install: install-headers install-lib$(install-shlib-dep)
4042

41-
install-headers:pgeasy.h
43+
install-headers:libpgeasy.h
4244
@if [!-d$(HEADERDIR) ];then mkdir$(HEADERDIR);fi
43-
$(INSTALL)$(INSTLOPTS)pgeasy.h$(HEADERDIR)/pgeasy.h
45+
$(INSTALL)$(INSTLOPTS)libpgeasy.h$(HEADERDIR)/libpgeasy.h
4446

4547
.PHONY: clean
4648

‎src/interfaces/libpgeasy/examples/pginsert.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#include<stdio.h>
77
#include<time.h>
88
#include<libpq-fe.h>
9-
#include"halt.h"
10-
#include"pgeasy.h"
9+
#include"../halt.h"
10+
#include"libpgeasy.h"
1111

1212
int
1313
main(intargc,char**argv)

‎src/interfaces/libpgeasy/examples/pgnulltest.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
#include<stdio.h>
99
#include<time.h>
10-
#include<halt.h>
1110
#include<libpq-fe.h>
12-
#include<pgeasy.h>
11+
#include"../halt.h"
12+
#include"libpgeasy.h"
1313

1414
int
1515
main(intargc,char**argv)

‎src/interfaces/libpgeasy/examples/pgwordcount.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
*/
55

66
#include<stdio.h>
7-
#include"halt.h"
87
#include<libpq-fe.h>
9-
#include"pgeasy.h"
8+
#include"../halt.h"
9+
#include"libpgeasy.h"
1010

1111
int
1212
main(intargc,char**argv)

‎src/interfaces/libpgeasy/halt.c

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,28 @@
55
**This is used to print out error messages and exit
66
*/
77

8-
#include<varargs.h>
8+
#include<stdarg.h>
99
#include<signal.h>
1010
#include<stdio.h>
1111
#include<stdlib.h>
1212
#include<string.h>
1313
#include<errno.h>
14-
14+
#include"halt.h"
1515

1616
/*-------------------------------------------------------------------------
1717
**
1818
**halt - print error message, and call clean up routine or exit
1919
**
2020
**------------------------------------------------------------------------*/
2121

22-
/*VARARGS*/
2322
void
24-
halt(va_alist)
25-
va_dcl
23+
halt(char*format, ...)
2624
{
2725
va_listarg_ptr;
28-
char*format,
29-
*pstr;
26+
char*pstr;
3027
void(*sig_func) ();
3128

32-
va_start(arg_ptr);
33-
format=va_arg(arg_ptr,char*);
29+
va_start(arg_ptr,format);
3430
if (strncmp(format,"PERROR",6)!=0)
3531
vfprintf(stderr,format,arg_ptr);
3632
else

‎src/interfaces/libpgeasy/halt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
**
44
*/
55

6-
voidhalt();
6+
voidhalt(char*format,...);

‎src/interfaces/libpgeasy/pgeasy.3

Lines changed: 0 additions & 71 deletions
This file was deleted.

0 commit comments

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