Skip to content

Commit 2d39b48

Browse files
authored
Merge pull request phpredis#1698 from TysonAndre/php-7-header
Remove "PHP Version 5" comment section
2 parents 7a79ad9 + 0ef488f commit 2d39b48

File tree

7 files changed

+4
-18
lines changed

7 files changed

+4
-18
lines changed

php_redis.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
/*
2-
+----------------------------------------------------------------------+
3-
| PHP Version 5 |
42
+----------------------------------------------------------------------+
53
| Copyright (c) 1997-2009 The PHP Group |
64
+----------------------------------------------------------------------+
@@ -263,15 +261,15 @@ PHP_MSHUTDOWN_FUNCTION(redis);
263261
PHP_MINFO_FUNCTION(redis);
264262

265263
/* Redis response handler function callback prototype */
266-
typedef void (*ResultCallback)(INTERNAL_FUNCTION_PARAMETERS,
264+
typedef void (*ResultCallback)(INTERNAL_FUNCTION_PARAMETERS,
267265
RedisSock *redis_sock, zval *z_tab, void *ctx);
268266

269267
PHP_REDIS_API int redis_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent);
270268

271269
PHP_REDIS_API int redis_response_enqueued(RedisSock *redis_sock);
272270

273271
PHP_REDIS_API int redis_sock_read_multibulk_multi_reply_loop(
274-
INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab,
272+
INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab,
275273
int numElems);
276274

277275
extern zend_module_entry redis_module_entry;

redis.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
/* -*- Mode: C; tab-width: 4 -*- */
22
/*
3-
+----------------------------------------------------------------------+
4-
| PHP Version 5 |
53
+----------------------------------------------------------------------+
64
| Copyright (c) 1997-2009 The PHP Group |
75
+----------------------------------------------------------------------+

redis_array.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
/*
2-
+----------------------------------------------------------------------+
3-
| PHP Version 5 |
42
+----------------------------------------------------------------------+
53
| Copyright (c) 1997-2009 The PHP Group |
64
+----------------------------------------------------------------------+

redis_array_impl.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
/*
2-
+----------------------------------------------------------------------+
3-
| PHP Version 5 |
42
+----------------------------------------------------------------------+
53
| Copyright (c) 1997-2009 The PHP Group |
64
+----------------------------------------------------------------------+
@@ -1196,7 +1194,7 @@ zval_rehash_callback(zend_fcall_info *z_cb, zend_fcall_info_cache *z_cb_cache,
11961194

11971195
z_cb->params = z_args;
11981196
z_cb->retval = z_ret;
1199-
1197+
12001198
z_cb->no_separation = 0;
12011199
z_cb->param_count = 2;
12021200

redis_cluster.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
/*
2-
+----------------------------------------------------------------------+
3-
| PHP Version 5 |
42
+----------------------------------------------------------------------+
53
| Copyright (c) 1997-2009 The PHP Group |
64
+----------------------------------------------------------------------+

redis_commands.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
/* -*- Mode: C; tab-width: 4 -*- */
22
/*
3-
+----------------------------------------------------------------------+
4-
| PHP Version 5 |
53
+----------------------------------------------------------------------+
64
| Copyright (c) 1997-2009 The PHP Group |
75
+----------------------------------------------------------------------+

redis_session.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
/* -*- Mode: C; tab-width: 4 -*- */
22
/*
3-
+----------------------------------------------------------------------+
4-
| PHP Version 5 |
53
+----------------------------------------------------------------------+
64
| Copyright (c) 1997-2009 The PHP Group |
75
+----------------------------------------------------------------------+
@@ -587,7 +585,7 @@ PS_CREATE_SID_FUNC(redis)
587585

588586
if (pool->lock_status.session_key) zend_string_release(pool->lock_status.session_key);
589587
pool->lock_status.session_key = redis_session_key(redis_sock, ZSTR_VAL(sid), ZSTR_LEN(sid));
590-
588+
591589
if (lock_acquire(redis_sock, &pool->lock_status) == SUCCESS) {
592590
return sid;
593591
}

0 commit comments

Comments
 (0)