diff options
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/libpgtcl/pgtclCmds.c | 6 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-auth.c | 22 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-lobj.c | 6 |
3 files changed, 14 insertions, 20 deletions
diff --git a/src/interfaces/libpgtcl/pgtclCmds.c b/src/interfaces/libpgtcl/pgtclCmds.c index 59e00b074d7..99b6f925e6c 100644 --- a/src/interfaces/libpgtcl/pgtclCmds.c +++ b/src/interfaces/libpgtcl/pgtclCmds.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.41 1999/02/13 23:22:38 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.42 1999/05/10 00:46:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1190,7 +1190,7 @@ Pg_lo_import(ClientData cData, Tcl_Interp * interp, int argc, char *argv[]) sprintf(interp->result, "Pg_lo_import of '%s' failed", filename); return TCL_ERROR; } - sprintf(interp->result, "%d", lobjId); + sprintf(interp->result, "%u", lobjId); return TCL_OK; } @@ -1228,7 +1228,7 @@ Pg_lo_export(ClientData cData, Tcl_Interp * interp, int argc, char *argv[]) retval = lo_export(conn, lobjId, filename); if (retval == -1) { - sprintf(interp->result, "Pg_lo_export %d %s failed", lobjId, filename); + sprintf(interp->result, "Pg_lo_export %u %s failed", lobjId, filename); return TCL_ERROR; } return TCL_OK; diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c index 99f273d2d23..5ecb4f517a4 100644 --- a/src/interfaces/libpq/fe-auth.c +++ b/src/interfaces/libpq/fe-auth.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.27 1999/03/14 16:06:43 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.28 1999/05/10 00:46:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -299,8 +299,7 @@ pg_krb5_init(void) if (code = krb5_cc_resolve(tktbuf, &ccache)) { (void) sprintf(PQerrormsg, - "pg_krb5_init: Kerberos error %d in krb5_cc_resolve\n", - code); + "pg_krb5_init: Kerberos error %d in krb5_cc_resolve\n", code); com_err("pg_krb5_init", code, "in krb5_cc_resolve"); return (krb5_ccache) NULL; } @@ -329,16 +328,14 @@ pg_krb5_authname(const char *PQerrormsg) if (code = krb5_cc_get_principal(ccache, &principal)) { (void) sprintf(PQerrormsg, - "pg_krb5_authname: Kerberos error %d in krb5_cc_get_principal\n", - code); + "pg_krb5_authname: Kerberos error %d in krb5_cc_get_principal\n", code); com_err("pg_krb5_authname", code, "in krb5_cc_get_principal"); return (char *) NULL; } if (code = krb5_unparse_name(principal, &authname)) { (void) sprintf(PQerrormsg, - "pg_krb5_authname: Kerberos error %d in krb5_unparse_name\n", - code); + "pg_krb5_authname: Kerberos error %d in krb5_unparse_name\n", code); com_err("pg_krb5_authname", code, "in krb5_unparse_name"); krb5_free_principal(principal); return (char *) NULL; @@ -387,8 +384,7 @@ pg_krb5_sendauth(const char *PQerrormsg, int sock, if (code = krb5_cc_get_principal(ccache, &client)) { (void) sprintf(PQerrormsg, - "pg_krb5_sendauth: Kerberos error %d in krb5_cc_get_principal\n", - code); + "pg_krb5_sendauth: Kerberos error %d in krb5_cc_get_principal\n", code); com_err("pg_krb5_sendauth", code, "in krb5_cc_get_principal"); return STATUS_ERROR; } @@ -415,8 +411,7 @@ pg_krb5_sendauth(const char *PQerrormsg, int sock, if (code = krb5_parse_name(servbuf, &server)) { (void) sprintf(PQerrormsg, - "pg_krb5_sendauth: Kerberos error %d in krb5_parse_name\n", - code); + "pg_krb5_sendauth: Kerberos error %d in krb5_parse_name\n", code); com_err("pg_krb5_sendauth", code, "in krb5_parse_name"); krb5_free_principal(client); return STATUS_ERROR; @@ -448,8 +443,7 @@ pg_krb5_sendauth(const char *PQerrormsg, int sock, else { (void) sprintf(PQerrormsg, - "pg_krb5_sendauth: Kerberos error %d in krb5_sendauth\n", - code); + "pg_krb5_sendauth: Kerberos error %d in krb5_sendauth\n", code); com_err("pg_krb5_sendauth", code, "in krb5_sendauth"); } } @@ -624,7 +618,7 @@ fe_getauthname(char *PQerrormsg) default: (void) sprintf(PQerrormsg, "fe_getauthname: invalid authentication system: %d\n", - authsvc); + authsvc); break; } diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index aa770ffe5ac..e618615d140 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.19 1999/02/13 23:22:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.20 1999/05/10 00:46:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -419,7 +419,7 @@ lo_import(PGconn *conn, char *filename) if (lobj == -1) { sprintf(conn->errorMessage, - "lo_import: could not open inv object oid %d", lobjOid); + "lo_import: could not open inv object oid %u", lobjOid); return InvalidOid; } @@ -464,7 +464,7 @@ lo_export(PGconn *conn, Oid lobjId, char *filename) if (lobj == -1) { sprintf(conn->errorMessage, - "lo_export: can't open inv object %d", lobjId); + "lo_export: can't open inv object %u", lobjId); return -1; } |