| blob | 56d5518a4cefd8d5058c0be324f1df5d8fc8c8d8 |
1 Index: d_soundfile.c
2 ===================================================================
3 RCS file: /cvsroot/pure-data/pd/src/d_soundfile.c,v
4 retrieving revision 1.12
5 diff -u -r1.12 d_soundfile.c
6 --- d_soundfile.c 9 Oct 2006 04:36:12 -0000 1.12
7 +++ d_soundfile.c 29 Nov 2007 14:01:06 -0000
8 @@ -758,7 +758,7 @@
9 if (itemswritten < nframes)
10 {
11 if (nframes < 0x7fffffff)
12 - pd_error(obj, "soundfiler_write: %d out of %d bytes written",
13 + pd_error(obj, "soundfiler_write: %ld out of %ld bytes written",
14 itemswritten, nframes);
15 /* try to fix size fields in header */
16 if (filetype == FORMAT_WAVE)
17 @@ -1088,7 +1088,7 @@
18 framesinfile = (eofis - poswas) / (channels * bytespersamp);
19 if (framesinfile > maxsize)
20 {
21 - pd_error(x, "soundfiler_read: truncated to %d elements", maxsize);
22 + pd_error(x, "soundfiler_read: truncated to %ld elements", maxsize);
23 framesinfile = maxsize;
24 }
25 if (framesinfile > bytelimit / (channels * bytespersamp))
26 Index: g_array.c
27 ===================================================================
28 RCS file: /cvsroot/pure-data/pd/src/g_array.c,v
29 retrieving revision 1.11
30 diff -u -r1.11 g_array.c
31 --- g_array.c 15 Aug 2006 04:54:15 -0000 1.11
32 +++ g_array.c 29 Nov 2007 14:01:06 -0000
33 @@ -1136,12 +1136,12 @@
34 t_array *a = garray_getarray_floatonly(x, &yonset, &elemsize);
35 if (!a)
36 {
37 - error("%s: needs floating-point 'y' field", x->x_realname);
38 + error("%s: needs floating-point 'y' field", x->x_realname->s_name);
39 return (0);
40 }
41 else if (elemsize != sizeof(t_word))
42 {
43 - error("%s: has more than one field", x->x_realname);
44 + error("%s: has more than one field", x->x_realname->s_name);
45 return (0);
46 }
47 *size = garray_npoints(x);
48 @@ -1164,7 +1164,7 @@
49 int yonset, i, elemsize;
50 t_array *array = garray_getarray_floatonly(x, &yonset, &elemsize);
51 if (!array)
52 - error("%s: needs floating-point 'y' field", x->x_realname);
53 + error("%s: needs floating-point 'y' field", x->x_realname->s_name);
54 else for (i = 0; i < array->a_n; i++)
55 *((float *)((char *)array->a_vec
56 + elemsize * i) + yonset) = g;
57 @@ -1180,7 +1180,7 @@
58 t_array *array = garray_getarray_floatonly(x, &yonset, &elemsize);
59 if (!array)
60 {
61 - error("%s: needs floating-point 'y' field", x->x_realname);
62 + error("%s: needs floating-point 'y' field", x->x_realname->s_name);
63 return;
64 }
65 if (npoints == 0)
66 @@ -1259,7 +1259,7 @@
67 t_array *array = garray_getarray_floatonly(x, &yonset, &elemsize);
68 if (!array)
69 {
70 - error("%s: needs floating-point 'y' field", x->x_realname);
71 + error("%s: needs floating-point 'y' field", x->x_realname->s_name);
72 return;
73 }
75 @@ -1294,7 +1294,7 @@
76 t_array *array = garray_getarray_floatonly(x, &yonset, &elemsize);
77 if (!array)
78 {
79 - error("%s: needs floating-point 'y' field", x->x_realname);
80 + error("%s: needs floating-point 'y' field", x->x_realname->s_name);
81 return;
82 }
83 if (argc < 2) return;
84 @@ -1375,7 +1375,7 @@
85 t_array *array = garray_getarray_floatonly(x, &yonset, &elemsize);
86 if (!array)
87 {
88 - error("%s: needs floating-point 'y' field", x->x_realname);
89 + error("%s: needs floating-point 'y' field", x->x_realname->s_name);
90 return;
91 }
92 nelem = array->a_n;
93 @@ -1411,7 +1411,7 @@
94 t_array *array = garray_getarray_floatonly(x, &yonset, &elemsize);
95 if (!array)
96 {
97 - error("%s: needs floating-point 'y' field", x->x_realname);
98 + error("%s: needs floating-point 'y' field", x->x_realname->s_name);
99 return;
100 }
101 canvas_makefilename(glist_getcanvas(x->x_glist), filename->s_name,
102 Index: g_canvas.c
103 ===================================================================
104 RCS file: /cvsroot/pure-data/pd/src/g_canvas.c,v
105 retrieving revision 1.18
106 diff -u -r1.18 g_canvas.c
107 --- g_canvas.c 9 Oct 2006 04:36:12 -0000 1.18
108 +++ g_canvas.c 29 Nov 2007 14:01:07 -0000
109 @@ -158,7 +158,7 @@
110 if (!x) bug("canvas_getenv");
111 while (!x->gl_env)
112 if (!(x = x->gl_owner))
113 - bug("t_canvasenvironment", x);
114 + bug("t_canvasenvironment");
115 return (x->gl_env);
116 }
118 Index: m_pd.h
119 ===================================================================
120 RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v
121 retrieving revision 1.16.2.2
122 diff -u -r1.16.2.2 m_pd.h
123 --- m_pd.h 18 Jul 2007 00:20:12 -0000 1.16.2.2
124 +++ m_pd.h 29 Nov 2007 14:01:08 -0000
125 @@ -443,10 +443,10 @@
126 EXTERN void postfloat(float f);
127 EXTERN void postatom(int argc, t_atom *argv);
128 EXTERN void endpost(void);
129 -EXTERN void error(const char *fmt, ...);
130 -EXTERN void verbose(int level, const char *fmt, ...);
131 -EXTERN void bug(const char *fmt, ...);
132 -EXTERN void pd_error(void *object, const char *fmt, ...);
133 +EXTERN void error(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
134 +EXTERN void verbose(int level, const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
135 +EXTERN void bug(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
136 +EXTERN void pd_error(void *object, const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
137 EXTERN void sys_logerror(const char *object, const char *s);
138 EXTERN void sys_unixerror(const char *object);
139 EXTERN void sys_ouch(void);