From 83f1674e70811e0f2c11b25d2caf8e70d675109f Mon Sep 17 00:00:00 2001 From: msweet Date: Fri, 29 Jan 2016 21:13:57 +0000 Subject: [PATCH] Fix deprecation and uninitialized value issues. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@13074 a1ca3aef-8c08-0410-bb20-df032aa958be --- cups/dest.c | 2 +- test/ipptool.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cups/dest.c b/cups/dest.c index a87ebed052..34abfdbcf8 100644 --- a/cups/dest.c +++ b/cups/dest.c @@ -3,7 +3,7 @@ * * User-defined destination (and option) support for CUPS. * - * Copyright 2007-2015 by Apple Inc. + * Copyright 2007-2016 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the diff --git a/test/ipptool.c b/test/ipptool.c index 6539e10e79..2988891694 100644 --- a/test/ipptool.c +++ b/test/ipptool.c @@ -3,7 +3,7 @@ * * ipptool command for CUPS. * - * Copyright 2007-2015 by Apple Inc. + * Copyright 2007-2016 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -1744,7 +1744,7 @@ do_tests(FILE *outfile, /* I - Output file */ tokenptr = ptr; } else - i = (int)strtol(tokenptr, &tokenptr, 0); + i = (int)strtol(token, &tokenptr, 0); values[0] = i; @@ -2662,7 +2662,7 @@ do_tests(FILE *outfile, /* I - Output file */ http->error != ETIMEDOUT) #endif /* WIN32 */ { - if (httpReconnect(http)) + if (httpReconnect2(http, 30000, NULL)) prev_pass = 0; } else if (status == HTTP_STATUS_ERROR || status == HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED) @@ -2689,13 +2689,13 @@ do_tests(FILE *outfile, /* I - Output file */ http->error != ETIMEDOUT) #endif /* WIN32 */ { - if (httpReconnect(http)) + if (httpReconnect2(http, 30000, NULL)) prev_pass = 0; } else if (status == HTTP_STATUS_ERROR) { if (!Cancel) - httpReconnect(http); + httpReconnect2(http, 30000, NULL); prev_pass = 0; } -- 2.47.2