Permalink
Browse files

Whitespace cleanup and fix some compiler warnings

  • Loading branch information...
1 parent 469fe5a commit d47a3ffd88cc05a270405e4701ad19886a20a168 @davidsklar committed Feb 16, 2012
Showing with 14 additions and 12 deletions.
  1. +14 −12 extension/xhprof.c
View
@@ -48,7 +48,7 @@
#elif __APPLE__
/*
* Patch for compiling in Mac OS X Leopard
- * @author Svilen Spasov <s.spasov@gmail.com>
+ * @author Svilen Spasov <s.spasov@gmail.com>
*/
# include <mach/mach_init.h>
# include <mach/thread_policy.h>
@@ -295,6 +295,15 @@ ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(arginfo_xhprof_sample_disable, 0)
ZEND_END_ARG_INFO()
+/* }}} */
+
+/**
+ * *********************
+ * FUNCTION PROTOTYPES
+ * *********************
+ */
+int restore_cpu_affinity(cpu_set_t * prev_mask);
+int bind_to_cpu(uint32 cpu_id);
/**
* *********************
@@ -751,7 +760,6 @@ void hp_clean_profiler_state(TSRMLS_D) {
size_t hp_get_entry_name(hp_entry_t *entry,
char *result_buf,
size_t result_len) {
- size_t len = 0;
/* Validate result_len */
if (result_len <= 1) {
@@ -781,7 +789,7 @@ size_t hp_get_entry_name(hp_entry_t *entry,
/**
* Check if this entry should be ignored, first with a conservative Bloomish
* filter then with an exact check against the function names.
- *
+ *
* @author mpal
*/
int hp_ignore_entry_work(uint8 hash_code, char *curr_func) {
@@ -802,7 +810,7 @@ int hp_ignore_entry_work(uint8 hash_code, char *curr_func) {
inline int hp_ignore_entry(uint8 hash_code, char *curr_func) {
/* First check if ignoring functions is enabled */
- return hp_globals.ignored_function_names != NULL &&
+ return hp_globals.ignored_function_names != NULL &&
hp_ignore_entry_work(hash_code, curr_func);
}
@@ -936,8 +944,6 @@ static char *hp_get_function_name(zend_op_array *ops TSRMLS_DC) {
}
} else {
long curr_op;
- int desc_len;
- char *desc;
int add_filename = 0;
/* we are dealing with a special directive/function like
@@ -1537,8 +1543,6 @@ zval * hp_mode_shared_endfn_cb(hp_entry_t *top,
zval *counts;
uint64 tsc_end;
- double gtod_value, rdtsc_value;
-
/* Get end tsc counter */
tsc_end = cycle_timer();
@@ -1813,8 +1817,6 @@ static void hp_end(TSRMLS_D) {
* hp_begin() and restores the original values.
*/
static void hp_stop(TSRMLS_D) {
- zval *ret;
- char *out_url;
int hp_profile_flag = 1;
/* End any unfinished calls */
@@ -1842,8 +1844,8 @@ static void hp_stop(TSRMLS_D) {
*/
/** Look in the PHP assoc array to find a key and return the zval associated
- * with it.
- *
+ * with it.
+ *
* @author mpal
**/
static zval *hp_zval_at_key(char *key,

2 comments on commit d47a3ff

this is unrelated to the pull request's purpose: to proxy eval()

Owner

davidsklar replied Mar 5, 2012

Would you like me to augment the pull request's description?

Please sign in to comment.