Skip to content

Commit

Permalink
avoid compiler warningsrc/modules/internet/libcurl.c
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.r-project.org/R/trunk@87104 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information
ripley committed Sep 7, 2024
1 parent ebf46f1 commit fe1f414
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 2 deletions.
1 change: 1 addition & 0 deletions src/include/Defn.h
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,7 @@ extern void R_WaitEvent(void);
# define FILESEP "/"
#endif /* Win32 */

/* A minimal version of F77_SUB from RS.h */
#ifdef HAVE_F77_UNDERSCORE
# define F77_SYMBOL(x) x ## _
# define F77_QSYMBOL(x) #x "_"
Expand Down
3 changes: 2 additions & 1 deletion src/include/R_ext/RS.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ extern void R_chk_free(void *);
external names containing an underscore.
but that is not used here (and none of gfortran, flang-new nor
x86_64 ifx do so: earlier Intel x86 compilere might have).
x86_64 ifx do so: earlier Intel x86 compilere might have). It is
used in Rdynload.c to support .Fortran.
*/

#ifdef HAVE_F77_UNDERSCORE
Expand Down
2 changes: 2 additions & 0 deletions src/main/Rdynload.c
Original file line number Diff line number Diff line change
Expand Up @@ -1107,6 +1107,8 @@ R_dlsym(DllInfo *info, char const *name,
snprintf(buf, len, "_%s", name);
#endif

/* HAVE_F77_EXTRA_UNDERSCORE is only use here and not in F77_NAME etc.
It seems of only historical interest */
#ifdef HAVE_F77_UNDERSCORE
if(symbol && symbol->type == R_FORTRAN_SYM) {
strcat(buf, "_");
Expand Down
2 changes: 1 addition & 1 deletion src/modules/internet/libcurl.c
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@ static void download_close_finished(download_cleanup_info *c)
/* compute URL index */
int *url_errs = NULL;
curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, &url_errs);
int i = url_errs - c->errs;
int i = (int)(url_errs - c->errs);

if (msg->data.result != CURLE_OK)
download_report_url_error(msg);
Expand Down

0 comments on commit fe1f414

Please sign in to comment.