1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
From f89c3328fd291a3854859c9634195582d098f520 Mon Sep 17 00:00:00 2001
From: Balint Reczey <balint.reczey@canonical.com>
Date: Tue, 13 Feb 2018 00:44:27 +0700
Subject: [PATCH] Fix interp2d info
Fixes interp2d_test.
---
ext/gsl_native/interp2d.c | 29 ++++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/ext/gsl_native/interp2d.c b/ext/gsl_native/interp2d.c
index e086eab..1e9b76a 100644
--- a/ext/gsl_native/interp2d.c
+++ b/ext/gsl_native/interp2d.c
@@ -235,15 +235,26 @@ static VALUE rb_gsl_interp2d_info(VALUE self)
rb_gsl_interp2d *p;
char buf[256];
Data_Get_Struct(self, rb_gsl_interp2d, p);
- sprintf(buf, "Class: %s\n", rb_class2name(CLASS_OF(self)));
- sprintf(buf, "%sSuperClass: %s\n", buf, rb_class2name(RCLASS_SUPER(CLASS_OF(self))));
- sprintf(buf, "%sType: %s\n", buf, gsl_interp2d_name(p->p));
- sprintf(buf, "%sxmin: %f\n", buf, p->p->xmin);
- sprintf(buf, "%sxmax: %f\n", buf, p->p->xmax);
- sprintf(buf, "%symin: %f\n", buf, p->p->ymin);
- sprintf(buf, "%symax: %f\n", buf, p->p->ymax);
- sprintf(buf, "%sxsize: %d\n", buf, (int) p->p->xsize);
- sprintf(buf, "%sysize: %d\n", buf, (int) p->p->ysize);
+ snprintf(buf, sizeof(buf)-1,
+ "Class: %s\n"
+ "SuperClass: %s\n"
+ "Type: %s\n"
+ "xmin: %f\n"
+ "xmax: %f\n"
+ "ymin: %f\n"
+ "ymax: %f\n"
+ "xsize: %d\n"
+ "ysize: %d\n",
+ rb_class2name(CLASS_OF(self)),
+ rb_class2name(RCLASS_SUPER(CLASS_OF(self))),
+ gsl_interp2d_name(p->p),
+ p->p->xmin,
+ p->p->xmax,
+ p->p->ymin,
+ p->p->ymax,
+ (int) p->p->xsize,
+ (int) p->p->ysize);
+ buf[sizeof(buf) - 1] = '\0';
return rb_str_new2(buf);
}
--
2.14.1
|
