diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2014-10-08 12:25:07 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2014-10-08 12:25:07 +0200 |
| commit | b90f6e87cf2acd1f4e1516a220ad1e23f826f788 (patch) | |
| tree | 5d198523d32c9c9b4d5d8c318676b113423b84b4 /lib | |
| parent | 987a4a7367ac8df32628ba738342e2206582f1e7 (diff) | |
| download | curl-b90f6e87cf2acd1f4e1516a220ad1e23f826f788.tar.gz | |
krb5_encode: remove unused argument
Coverity CID 1241957. Removed the unused argument. As this struct and
pointer now are used only for krb5, there's no need to keep unused
function arguments around.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/curl_sec.h | 4 | ||||
| -rw-r--r-- | lib/krb5.c | 8 | ||||
| -rw-r--r-- | lib/security.c | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/lib/curl_sec.h b/lib/curl_sec.h index 82151e9c7..6c48da243 100644 --- a/lib/curl_sec.h +++ b/lib/curl_sec.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -30,7 +30,7 @@ struct Curl_sec_client_mech { void (*end)(void *); int (*check_prot)(void *, int); int (*overhead)(void *, int, int); - int (*encode)(void *, const void*, int, int, void**, struct connectdata *); + int (*encode)(void *, const void*, int, int, void**); int (*decode)(void *, void*, int, int, struct connectdata *); }; diff --git a/lib/krb5.c b/lib/krb5.c index 7e82a6805..bc90c1218 100644 --- a/lib/krb5.c +++ b/lib/krb5.c @@ -2,7 +2,7 @@ * * Copyright (c) 1995, 1996, 1997, 1998, 1999, 2013 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). - * Copyright (c) 2004 - 2012 Daniel Stenberg + * Copyright (c) 2004 - 2014 Daniel Stenberg * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -121,8 +121,7 @@ krb5_overhead(void *app_data, int level, int len) } static int -krb5_encode(void *app_data, const void *from, int length, int level, void **to, - struct connectdata *conn UNUSED_PARAM) +krb5_encode(void *app_data, const void *from, int length, int level, void **to) { gss_ctx_id_t *context = app_data; gss_buffer_desc dec, enc; @@ -130,9 +129,6 @@ krb5_encode(void *app_data, const void *from, int length, int level, void **to, int state; int len; - /* shut gcc up */ - conn = NULL; - /* NOTE that the cast is safe, neither of the krb5, gnu gss and heimdal * libraries modify the input buffer in gss_seal() */ diff --git a/lib/security.c b/lib/security.c index ca17c5641..25cfa2170 100644 --- a/lib/security.c +++ b/lib/security.c @@ -295,7 +295,7 @@ static void do_sec_send(struct connectdata *conn, curl_socket_t fd, prot_level = conn->command_prot; } bytes = conn->mech->encode(conn->app_data, from, length, prot_level, - (void**)&buffer, conn); + (void**)&buffer); if(!buffer || bytes <= 0) return; /* error */ |