From 2bc1d775f510196154283374284f98d3eae03544 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 2 Jan 2023 13:51:48 +0100 Subject: copyright: update all copyright lines and remove year ranges - they are mostly pointless in all major jurisdictions - many big corporations and projects already don't use them - saves us from pointless churn - git keeps history for us - the year range is kept in COPYING checksrc is updated to allow non-year using copyright statements Closes #10205 --- docs/libcurl/opts/CURLOPT_SEEKFUNCTION.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/libcurl/opts/CURLOPT_SEEKFUNCTION.3') diff --git a/docs/libcurl/opts/CURLOPT_SEEKFUNCTION.3 b/docs/libcurl/opts/CURLOPT_SEEKFUNCTION.3 index ee2a83ba5..846ac1f47 100644 --- a/docs/libcurl/opts/CURLOPT_SEEKFUNCTION.3 +++ b/docs/libcurl/opts/CURLOPT_SEEKFUNCTION.3 @@ -5,7 +5,7 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +.\" * Copyright (C) Daniel Stenberg, , et al. .\" * .\" * This software is licensed as described in the file COPYING, which .\" * you should have received as part of this distribution. The terms -- cgit v1.2.3 From 1695fcf57d53230adc6c8cbe20a283690019db02 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 7 Feb 2023 15:58:17 +0100 Subject: man pages: call the custom user pointer 'clientp' consistently The variable had a few different names. Now try to use 'clientp' consistently for all man pages using a custom pointer set by the application. Reported-by: Gerrit Renker Fixes #10434 Closes #10435 --- docs/libcurl/opts/CURLOPT_SEEKFUNCTION.3 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/libcurl/opts/CURLOPT_SEEKFUNCTION.3') diff --git a/docs/libcurl/opts/CURLOPT_SEEKFUNCTION.3 b/docs/libcurl/opts/CURLOPT_SEEKFUNCTION.3 index 846ac1f47..9d26a548e 100644 --- a/docs/libcurl/opts/CURLOPT_SEEKFUNCTION.3 +++ b/docs/libcurl/opts/CURLOPT_SEEKFUNCTION.3 @@ -35,7 +35,7 @@ CURLOPT_SEEKFUNCTION \- user callback for seeking in input stream #define CURL_SEEKFUNC_CANTSEEK 2 /* tell libcurl seeking cannot be done, so libcurl might try other means instead */ -int seek_callback(void *userp, curl_off_t offset, int origin); +int seek_callback(void *clientp, curl_off_t offset, int origin); CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SEEKFUNCTION, seek_callback); .SH DESCRIPTION @@ -53,7 +53,7 @@ connection. The function shall work like fseek(3) or lseek(3) and it gets SEEK_SET, SEEK_CUR or SEEK_END as argument for \fIorigin\fP, although libcurl currently only passes SEEK_SET. -\fIuserp\fP is the pointer you set with \fICURLOPT_SEEKDATA(3)\fP. +\fIclientp\fP is the pointer you set with \fICURLOPT_SEEKDATA(3)\fP. The callback function must return \fICURL_SEEKFUNC_OK\fP on success, \fICURL_SEEKFUNC_FAIL\fP to cause the upload operation to fail or @@ -70,9 +70,9 @@ By default, this is NULL and unused. HTTP, FTP, SFTP .SH EXAMPLE .nf -static int seek_cb(void *userp, curl_off_t offset, int origin) +static int seek_cb(void *clientp, curl_off_t offset, int origin) { - struct data *d = (struct data *)userp; + struct data *d = (struct data *)clientp; lseek(our_fd, offset, origin); return CURL_SEEKFUNC_OK; } -- cgit v1.2.3