From bf71a62b52dedd8ceaa47a96c144a3584e1bd95b Mon Sep 17 00:00:00 2001 From: MelissaWM Date: Wed, 23 Sep 2020 23:09:46 -0300 Subject: BUG: Fixes module data docstrings. Fixes gh-15325 --- numpy/f2py/src/fortranobject.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'numpy/f2py/src/fortranobject.c') diff --git a/numpy/f2py/src/fortranobject.c b/numpy/f2py/src/fortranobject.c index aa46c57d0..e420b827b 100644 --- a/numpy/f2py/src/fortranobject.c +++ b/numpy/f2py/src/fortranobject.c @@ -213,6 +213,7 @@ format_def(char *buf, Py_ssize_t size, FortranDataDef def) return -1; } memcpy(p, notalloc, sizeof(notalloc)); + p += sizeof(notalloc); } return p - buf; @@ -255,7 +256,7 @@ fortran_doc(FortranDataDef def) } else { PyArray_Descr *d = PyArray_DescrFromType(def.type); - n = PyOS_snprintf(p, size, "'%c'-", d->type); + n = PyOS_snprintf(p, size, "%s : '%c'-", def.name, d->type); Py_DECREF(d); if (n < 0 || n >= size) { goto fail; @@ -264,7 +265,7 @@ fortran_doc(FortranDataDef def) size -= n; if (def.data == NULL) { - n = format_def(p, size, def) == -1; + n = format_def(p, size, def);// == -1; if (n < 0) { goto fail; } @@ -288,6 +289,7 @@ fortran_doc(FortranDataDef def) p += n; size -= n; } + } if (size <= 1) { goto fail; -- cgit v1.2.1 From 2379f4c1a8f93b1f4e3e0cd40b587ca6e95d3f06 Mon Sep 17 00:00:00 2001 From: MelissaWM Date: Thu, 24 Sep 2020 19:43:24 -0300 Subject: Adding PR review comment. --- numpy/f2py/src/fortranobject.c | 1 + 1 file changed, 1 insertion(+) (limited to 'numpy/f2py/src/fortranobject.c') diff --git a/numpy/f2py/src/fortranobject.c b/numpy/f2py/src/fortranobject.c index e420b827b..215473ed8 100644 --- a/numpy/f2py/src/fortranobject.c +++ b/numpy/f2py/src/fortranobject.c @@ -214,6 +214,7 @@ format_def(char *buf, Py_ssize_t size, FortranDataDef def) } memcpy(p, notalloc, sizeof(notalloc)); p += sizeof(notalloc); + size -= sizeof(notalloc); } return p - buf; -- cgit v1.2.1 From dbe6d464dbde074d207804e3aed1b3cfaacf0eda Mon Sep 17 00:00:00 2001 From: MelissaWM Date: Sat, 26 Sep 2020 10:01:01 -0300 Subject: Removing extra comment. --- numpy/f2py/src/fortranobject.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'numpy/f2py/src/fortranobject.c') diff --git a/numpy/f2py/src/fortranobject.c b/numpy/f2py/src/fortranobject.c index 215473ed8..3275f90ad 100644 --- a/numpy/f2py/src/fortranobject.c +++ b/numpy/f2py/src/fortranobject.c @@ -266,7 +266,7 @@ fortran_doc(FortranDataDef def) size -= n; if (def.data == NULL) { - n = format_def(p, size, def);// == -1; + n = format_def(p, size, def); if (n < 0) { goto fail; } -- cgit v1.2.1