| 1 |
Description: Some nasty typos fixed to silence lintian et al. |
| 2 |
Author: Mike Gabriel <[email protected]> |
| 3 |
|
| 4 |
Index: Mesa/src/mesa/main/debug.c |
| 5 |
=================================================================== |
| 6 |
--- Mesa.orig/src/mesa/main/debug.c |
| 7 |
+++ Mesa/src/mesa/main/debug.c |
| 8 |
@@ -43,7 +43,7 @@ const char *_mesa_prim_name[GL_POLYGON+4 |
| 9 |
"GL_QUAD_STRIP", |
| 10 |
"GL_POLYGON", |
| 11 |
"outside begin/end", |
| 12 |
- "inside unkown primitive", |
| 13 |
+ "inside unknown primitive", |
| 14 |
"unknown state" |
| 15 |
}; |
| 16 |
|
| 17 |
Index: Mesa/src/mesa/shader/arbprogparse.c |
| 18 |
=================================================================== |
| 19 |
--- Mesa.orig/src/mesa/shader/arbprogparse.c |
| 20 |
+++ Mesa/src/mesa/shader/arbprogparse.c |
| 21 |
@@ -97,8 +97,8 @@ |
| 22 |
* |
| 23 |
* Cosmetic Stuff |
| 24 |
* ----------------------------------------------------- |
| 25 |
- * - remove any leftover unused grammer.c stuff (dict_ ?) |
| 26 |
- * - fix grammer.c error handling so its not static |
| 27 |
+ * - remove any leftover unused grammar.c stuff (dict_ ?) |
| 28 |
+ * - fix grammar.c error handling so its not static |
| 29 |
* - #ifdef around stuff pertaining to extentions |
| 30 |
* |
| 31 |
* Outstanding Questions: |
| 32 |
@@ -1703,7 +1703,7 @@ parse_attrib (GLcontext * ctx, GLubyte * |
| 33 |
if (found) { |
| 34 |
error_msg = (char *) |
| 35 |
_mesa_malloc (_mesa_strlen ((char *) attrib_var->name) + 40); |
| 36 |
- _mesa_sprintf (error_msg, "Duplicate Varible Declaration: %s", |
| 37 |
+ _mesa_sprintf (error_msg, "Duplicate Variable Declaration: %s", |
| 38 |
attrib_var->name); |
| 39 |
|
| 40 |
_mesa_set_program_error (ctx, Program->Position, error_msg); |
| 41 |
@@ -1904,7 +1904,7 @@ parse_param (GLcontext * ctx, GLubyte ** |
| 42 |
|
| 43 |
if (found) { |
| 44 |
error_msg = (char *) _mesa_malloc (_mesa_strlen ((char *) param_var->name) + 40); |
| 45 |
- _mesa_sprintf (error_msg, "Duplicate Varible Declaration: %s", |
| 46 |
+ _mesa_sprintf (error_msg, "Duplicate Variable Declaration: %s", |
| 47 |
param_var->name); |
| 48 |
|
| 49 |
_mesa_set_program_error (ctx, Program->Position, error_msg); |
| 50 |
@@ -2013,7 +2013,7 @@ parse_temp (GLcontext * ctx, GLubyte ** |
| 51 |
if (found) { |
| 52 |
error_msg = (char *) |
| 53 |
_mesa_malloc (_mesa_strlen ((char *) temp_var->name) + 40); |
| 54 |
- _mesa_sprintf (error_msg, "Duplicate Varible Declaration: %s", |
| 55 |
+ _mesa_sprintf (error_msg, "Duplicate Variable Declaration: %s", |
| 56 |
temp_var->name); |
| 57 |
|
| 58 |
_mesa_set_program_error (ctx, Program->Position, error_msg); |
| 59 |
@@ -2064,7 +2064,7 @@ parse_output (GLcontext * ctx, GLubyte * |
| 60 |
char *error_msg; |
| 61 |
error_msg = (char *) |
| 62 |
_mesa_malloc (_mesa_strlen ((char *) output_var->name) + 40); |
| 63 |
- _mesa_sprintf (error_msg, "Duplicate Varible Declaration: %s", |
| 64 |
+ _mesa_sprintf (error_msg, "Duplicate Variable Declaration: %s", |
| 65 |
output_var->name); |
| 66 |
|
| 67 |
_mesa_set_program_error (ctx, Program->Position, error_msg); |
| 68 |
@@ -2099,7 +2099,7 @@ parse_alias (GLcontext * ctx, GLubyte ** |
| 69 |
if (found) { |
| 70 |
error_msg = (char *) |
| 71 |
_mesa_malloc (_mesa_strlen ((char *) temp_var->name) + 40); |
| 72 |
- _mesa_sprintf (error_msg, "Duplicate Varible Declaration: %s", |
| 73 |
+ _mesa_sprintf (error_msg, "Duplicate Variable Declaration: %s", |
| 74 |
temp_var->name); |
| 75 |
|
| 76 |
_mesa_set_program_error (ctx, Program->Position, error_msg); |
| 77 |
@@ -2149,7 +2149,7 @@ parse_address (GLcontext * ctx, GLubyte |
| 78 |
if (found) { |
| 79 |
error_msg = (char *) |
| 80 |
_mesa_malloc (_mesa_strlen ((char *) temp_var->name) + 40); |
| 81 |
- _mesa_sprintf (error_msg, "Duplicate Varible Declaration: %s", |
| 82 |
+ _mesa_sprintf (error_msg, "Duplicate Variable Declaration: %s", |
| 83 |
temp_var->name); |
| 84 |
|
| 85 |
_mesa_set_program_error (ctx, Program->Position, error_msg); |
| 86 |
@@ -3980,7 +3980,7 @@ _mesa_parse_arb_program (GLcontext * ctx |
| 87 |
grammar_get_last_error ((GLubyte *) error_msg, 300, &error_pos); |
| 88 |
_mesa_set_program_error (ctx, error_pos, error_msg); |
| 89 |
_mesa_error (ctx, GL_INVALID_OPERATION, |
| 90 |
- "Error loading grammer rule set"); |
| 91 |
+ "Error loading grammar rule set"); |
| 92 |
return GL_FALSE; |
| 93 |
} |
| 94 |
|
| 95 |
@@ -4070,7 +4070,7 @@ _mesa_parse_arb_program (GLcontext * ctx |
| 96 |
} |
| 97 |
|
| 98 |
#if DEBUG_PARSING |
| 99 |
- printf ("Destroying grammer dict [parse retval: %d]\n", err); |
| 100 |
+ printf ("Destroying grammar dict [parse retval: %d]\n", err); |
| 101 |
#endif |
| 102 |
grammar_destroy (arbprogram_syn_id); |
| 103 |
|
| 104 |
@@ -4103,11 +4103,11 @@ _mesa_parse_arb_program (GLcontext * ctx |
| 105 |
/* Start examining the tokens in the array */ |
| 106 |
inst = parsed; |
| 107 |
|
| 108 |
- /* Check the grammer rev */ |
| 109 |
+ /* Check the grammar rev */ |
| 110 |
if (*inst++ != REVISION) { |
| 111 |
_mesa_set_program_error (ctx, 0, "Grammar version mismatch"); |
| 112 |
_mesa_error(ctx, GL_INVALID_OPERATION, |
| 113 |
- "glProgramStringARB(Grammar verison mismatch)"); |
| 114 |
+ "glProgramStringARB(Grammar version mismatch)"); |
| 115 |
err = GL_TRUE; |
| 116 |
} |
| 117 |
else { |