[xdebug-dev] xdebug xdebug/xdebug.c xdebug/xdebug_code_coverage.c xdebug/xdebug_code_coverage.h - s/prefil/prefill (Patch by Sebastian Bergmann)

Date: Mon Oct 16 22:11:23 CEST 2006
User: Derick Rethans
Directory: xdebug

Log Message:
[0.05]
- s/prefil/prefill (Patch by Sebastian Bergmann)

Modified files:
           xdebug/xdebug.c (version: 1.355)
           xdebug/xdebug_code_coverage.c (version: 1.27)
           xdebug/xdebug_code_coverage.h (version: 1.10)

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -r1.354 -r1.355
--- xdebug/xdebug.c:1.354 Wed Oct 11 06:54:30 2006 GMT
+++ xdebug/xdebug.c Mon Oct 16 18:11:23 2006 GMT
@@ -1396,7 +1396,7 @@
         }
 
         if (XG(do_code_coverage) && XG(code_coverage_unused)) {
- xdebug_prefil_code_coverage(fse, op_array TSRMLS_CC);
+ xdebug_prefill_code_coverage(fse, op_array TSRMLS_CC);
         }
 
         /* If we're in an eval, we need to create an ID for it. This ID however

[FILE: /xdebug/xdebug_code_coverage.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xdebug/xdebug_code_coverage.c:1.26 Wed Oct 11 06:54:30 2006 GMT
+++ xdebug/xdebug_code_coverage.c Mon Oct 16 18:11:23 2006 GMT
@@ -82,7 +82,7 @@
         xdfree(sline);
 }
 
-static void prefil_from_opcode(function_stack_entry *fse, char *fn, zend_op opcode, int deadcode TSRMLS_DC)
+static void prefill_from_opcode(function_stack_entry *fse, char *fn, zend_op opcode, int deadcode TSRMLS_DC)
 {
         if (
                 opcode.opcode != ZEND_NOP &&
@@ -201,7 +201,7 @@
                 xdebug_set_add(set, position);
         }
 }
-static void prefil_from_oparray(function_stack_entry *fse, char *fn, zend_op_array *opa TSRMLS_DC)
+static void prefill_from_oparray(function_stack_entry *fse, char *fn, zend_op_array *opa TSRMLS_DC)
 {
         char cache_key[256];
         int cache_key_len;
@@ -233,7 +233,7 @@
         /* The normal loop then finally */
         for (i = 0; i < opa->size; i++) {
                 zend_op opcode = opa->opcodes[i];
- prefil_from_opcode(NULL, fn, opcode, set ? !xdebug_set_in(set, i) : 0 TSRMLS_CC);
+ prefill_from_opcode(NULL, fn, opcode, set ? !xdebug_set_in(set, i) : 0 TSRMLS_CC);
         }
 
         if (set) {
@@ -241,7 +241,7 @@
         }
 }
 
-static int prefil_from_function_table(zend_op_array *opa, int num_args, va_list args, zend_hash_key *hash_key)
+static int prefill_from_function_table(zend_op_array *opa, int num_args, va_list args, zend_hash_key *hash_key)
 {
         char *new_filename;
         TSRMLS_FETCH();
@@ -249,7 +249,7 @@
         new_filename = va_arg(args, char*);
         if (opa->type == ZEND_USER_FUNCTION) {
                 if (opa->filename && strcmp(opa->filename, new_filename) == 0) {
- prefil_from_oparray(NULL, new_filename, opa TSRMLS_CC);
+ prefill_from_oparray(NULL, new_filename, opa TSRMLS_CC);
                 }
         }
 
@@ -257,9 +257,9 @@
 }
 
 #ifdef ZEND_ENGINE_2
-static int prefil_from_class_table(zend_class_entry **class_entry, int num_args, va_list args, zend_hash_key *hash_key)
+static int prefill_from_class_table(zend_class_entry **class_entry, int num_args, va_list args, zend_hash_key *hash_key)
 #else
-static int prefil_from_class_table(zend_class_entry *class_entry, int num_args, va_list args, zend_hash_key *hash_key)
+static int prefill_from_class_table(zend_class_entry *class_entry, int num_args, va_list args, zend_hash_key *hash_key)
 #endif
 {
         char *new_filename;
@@ -273,18 +273,18 @@
 
         new_filename = va_arg(args, char*);
         if (ce->type == ZEND_USER_CLASS) {
- zend_hash_apply_with_arguments(&ce->function_table, (apply_func_args_t) prefil_from_function_table, 1, new_filename);
+ zend_hash_apply_with_arguments(&ce->function_table, (apply_func_args_t) prefill_from_function_table, 1, new_filename);
         }
 
         return ZEND_HASH_APPLY_KEEP;
 }
 
-void xdebug_prefil_code_coverage(function_stack_entry *fse, zend_op_array *op_array TSRMLS_DC)
+void xdebug_prefill_code_coverage(function_stack_entry *fse, zend_op_array *op_array TSRMLS_DC)
 {
- prefil_from_oparray(fse, op_array->filename, op_array TSRMLS_CC);
+ prefill_from_oparray(fse, op_array->filename, op_array TSRMLS_CC);
 
- zend_hash_apply_with_arguments(CG(function_table), (apply_func_args_t) prefil_from_function_table, 1, op_array->filename);
- zend_hash_apply_with_arguments(CG(class_table), (apply_func_args_t) prefil_from_class_table, 1, op_array->filename);
+ zend_hash_apply_with_arguments(CG(function_table), (apply_func_args_t) prefill_from_function_table, 1, op_array->filename);
+ zend_hash_apply_with_arguments(CG(class_table), (apply_func_args_t) prefill_from_class_table, 1, op_array->filename);
 }
 
 PHP_FUNCTION(xdebug_start_code_coverage)

[FILE: /xdebug/xdebug_code_coverage.h]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xdebug/xdebug_code_coverage.h:1.9 Mon Sep 25 18:20:01 2006 GMT
+++ xdebug/xdebug_code_coverage.h Mon Oct 16 18:11:23 2006 GMT
@@ -38,7 +38,7 @@
 void xdebug_coverage_file_dtor(void *data);
 
 void xdebug_count_line(char *file, int lineno, int executable, int deadcode TSRMLS_DC);
-void xdebug_prefil_code_coverage(function_stack_entry *fse, zend_op_array *op_array TSRMLS_DC);
+void xdebug_prefill_code_coverage(function_stack_entry *fse, zend_op_array *op_array TSRMLS_DC);
 
 PHP_FUNCTION(xdebug_start_code_coverage);
 PHP_FUNCTION(xdebug_stop_code_coverage);
Received on Mon Oct 16 2006 - 22:11:24 BST