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
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
|
Description: source typo
Correct spelling error as reported by lintian in some binraries;
meant to silence lintian and eventually to be submitted to the
upstream maintainer.
Origin: vendor, Debian
Forwarded: by email
Comment: spelling-error-in-binary
Author: Jerome Benoit <calculus@rezozer.net>
Last-Update: 2016-08-01
--- a/demosrc/parse.c
+++ b/demosrc/parse.c
@@ -174,7 +174,7 @@
streampos = ftell(ph->ifp);
- /* count lines up to approximate position where error occured */
+ /* count lines up to approximate position where error occurred */
fseek(ph->ifp, 0, SEEK_SET);
i=0;
@@ -199,7 +199,7 @@
printf(" Encountered a syntax error in file %s\n", ph->filename);
printf(" Expected to find %s\n", string);
printf(" Actually found: %s\n", found);
- printf(" Error occured at or prior to file offset %ld, line %ld\n",
+ printf(" Error occurred at or prior to file offset %ld, line %ld\n",
streampos, linecount);
printf(" Error position is only approximate, but should be close\n\n");
@@ -719,7 +719,7 @@
}
if (n != 3 ) {
- rc |= PARSEBADSYNTAX; /* unparsed hex color occured */
+ rc |= PARSEBADSYNTAX; /* unparsed hex color occurred */
}
/* save RGB data to texture map */
--- a/demosrc/glwin.c
+++ b/demosrc/glwin.c
@@ -727,7 +727,7 @@
enum SpwRetVal res;
res = SiClose(handle->sball); /* close spaceball device */
if (res != SPW_NO_ERROR)
- printf("An error occured during Spaceball shutdown.\n");
+ printf("An error occurred during Spaceball shutdown.\n");
SiTerminate(); /* shutdown spaceware input library */
}
--- a/src/threads.c
+++ b/src/threads.c
@@ -1692,7 +1692,7 @@
}
-/* worker thread calls this to indicate that an unrecoverable error occured */
+/* worker thread calls this to indicate that an unrecoverable error occurred */
int rt_threadpool_setfatalerror(void *voidparms) {
rt_threadpool_workerdata_t *worker = (rt_threadpool_workerdata_t *) voidparms;
rt_shared_iterator_setfatalerror(worker->iter);
@@ -1700,7 +1700,7 @@
}
-/* worker thread calls this to indicate that an unrecoverable error occured */
+/* worker thread calls this to indicate that an unrecoverable error occurred */
int rt_threadpool_getfatalerror(void *voidparms) {
rt_threadpool_workerdata_t *worker = (rt_threadpool_workerdata_t *) voidparms;
/* query error status for return to caller */
@@ -1816,7 +1816,7 @@
}
-/** worker thread calls this to indicate that an unrecoverable error occured */
+/** worker thread calls this to indicate that an unrecoverable error occurred */
int rt_threadlaunch_setfatalerror(void *voidparms) {
rt_threadlaunch_t *worker = (rt_threadlaunch_t *) voidparms;
return rt_shared_iterator_setfatalerror(worker->iter);
--- a/src/threads.h
+++ b/src/threads.h
@@ -362,7 +362,7 @@
/**
* iterate the shared iterator with a requested tile size,
* returns the tile received, and a return code of -1 if no
- * iterations left or a fatal error has occured during processing,
+ * iterations left or a fatal error has occurred during processing,
* canceling all worker threads.
*/
int rt_shared_iterator_next_tile(rt_shared_iterator_t *it, int reqsize,
@@ -468,7 +468,7 @@
*/
int rt_threadpool_tile_failed(void *thrpool, rt_tasktile_t *tile);
-/** worker thread calls this to indicate that an unrecoverable error occured */
+/** worker thread calls this to indicate that an unrecoverable error occurred */
int rt_threadpool_setfatalerror(void *thrparms);
/** master thread calls this to query for fatal errors */
@@ -508,7 +508,7 @@
int rt_threadlaunch_next_tile(void *voidparms, int reqsize,
rt_tasktile_t *tile);
-/** worker thread calls this to indicate that an unrecoverable error occured */
+/** worker thread calls this to indicate that an unrecoverable error occurred */
int rt_threadlaunch_setfatalerror(void *thrparms);
|
