Skip to content

Commit 49dcd0b

Browse files
author
Jeff Whitaker
authored
Merge pull request #1322 from opoplawski/incompatible-pointer
Fix incompatbile pointer argument to nc_put_att_string()
2 parents a3766f4 + ea590c2 commit 49dcd0b

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

include/netCDF4.pxi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ cdef extern from "netcdf.h":
263263
size_t len, void *op) nogil
264264
int nc_get_att(int ncid, int varid, char *name, void *ip) nogil
265265
int nc_get_att_string(int ncid, int varid, char *name, char **ip) nogil
266-
int nc_put_att_string(int ncid, int varid, char *name, size_t len, char **op) nogil
266+
int nc_put_att_string(int ncid, int varid, char *name, size_t len, const char **op) nogil
267267
int nc_def_opaque(int ncid, size_t size, char *name, nc_type *xtypep) nogil
268268
int nc_inq_opaque(int ncid, nc_type xtype, char *name, size_t *sizep) nogil
269269
int nc_put_att_opaque(int ncid, int varid, char *name,

src/netCDF4/_netCDF4.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1796,7 +1796,7 @@ be raised in the next release."""
17961796
string_ptrs[j] = strings[j]
17971797
issue485_workaround(grpid, varid, attname)
17981798
with nogil:
1799-
ierr = nc_put_att_string(grpid, varid, attname, N, string_ptrs)
1799+
ierr = nc_put_att_string(grpid, varid, attname, N, <const char**>string_ptrs)
18001800
finally:
18011801
PyMem_Free(string_ptrs)
18021802
else:
@@ -1825,7 +1825,7 @@ be raised in the next release."""
18251825
except UnicodeError:
18261826
issue485_workaround(grpid, varid, attname)
18271827
with nogil:
1828-
ierr = nc_put_att_string(grpid, varid, attname, 1, &datstring)
1828+
ierr = nc_put_att_string(grpid, varid, attname, 1, <const char**>&datstring)
18291829
else:
18301830
with nogil:
18311831
ierr = nc_put_att_text(grpid, varid, attname, lenarr, datstring)

0 commit comments

Comments
 (0)