projects / packages / php-pecl-session_mysql.git / blame
| Commit | Line | Data |
|---|---|---|
| fd1bc243 ER |
1 | --- session_mysql-1.8/session_mysql.c 2006-04-17 04:29:01.000000000 +0300 |
| 2 | +++ session_mysql-1.8.ZTS/session_mysql.c 2006-06-12 15:41:55.472008927 +0300 | |
| 3 | @@ -264,7 +264,7 @@ | |
| 4 | PS_MOD(mysql) | |
| 5 | }; | |
| 6 | ||
| 7 | -static char *get_escapedhost() { | |
| 8 | +static char *get_escapedhost(TSRMLS_D) { | |
| 9 | char *server_name, *escapedhost; | |
| 10 | int host_len; | |
| 11 | ||
| 12 | @@ -283,7 +283,7 @@ | |
| 13 | return escapedhost; | |
| 14 | } | |
| 15 | ||
| 16 | -static int session_mysql_connect() { | |
| 17 | +static int session_mysql_connect(TSRMLS_D) { | |
| 18 | #if MYSQL_VERSION_ID >= 50013 | |
| 19 | my_bool opt=1; | |
| 20 | #endif | |
| 21 | @@ -318,7 +318,7 @@ | |
| 22 | return FAILURE; | |
| 23 | } | |
| 24 | ||
| 25 | -static void session_mysql_close() { | |
| 26 | +static void session_mysql_close(TSRMLS_D) { | |
| 27 | if (!SESSION_MYSQL_G(persistent)) { | |
| 28 | mysql_close(SESSION_MYSQL_G(mysql)); | |
| 29 | SESSION_MYSQL_G(mysql)=NULL; | |
| 30 | @@ -343,7 +343,7 @@ | |
| 31 | my_ulonglong rows; | |
| 32 | unsigned long *lengths; | |
| 33 | ||
| 34 | - escapedhost=get_escapedhost(); | |
| 35 | + escapedhost=get_escapedhost(TSRMLS_C); | |
| 36 | escapedhost_len=strlen(escapedhost); | |
| 37 | ||
| 38 | key_len=strlen(key); | |
| 39 | @@ -424,7 +424,7 @@ | |
| 40 | char *query_unlock=NULL; | |
| 41 | MYSQL_RES *res; | |
| 42 | ||
| 43 | - escapedhost=get_escapedhost(); | |
| 44 | + escapedhost=get_escapedhost(TSRMLS_C); | |
| 45 | escapedhost_len=strlen(escapedhost); | |
| 46 | ||
| 47 | key_len=strlen(key); | |
| 48 | @@ -506,7 +506,7 @@ | |
| 49 | my_ulonglong rows; | |
| 50 | unsigned long *lengths; | |
| 51 | ||
| 52 | - escapedhost=get_escapedhost(); | |
| 53 | + escapedhost=get_escapedhost(TSRMLS_C); | |
| 54 | escapedhost_len=strlen(escapedhost); | |
| 55 | ||
| 56 | key_len=strlen(key); | |
| 57 | @@ -554,7 +554,7 @@ | |
| 58 | return ret; | |
| 59 | } | |
| 60 | ||
| 61 | -static int session_mysql_gc() { | |
| 62 | +static int session_mysql_gc(TSRMLS_D) { | |
| 63 | char *prequery="delete from phpsession where unix_timestamp()>=sess_mtime+%s"; | |
| 64 | char *query=NULL; | |
| 65 | char *query_optimize="optimize table phpsession"; | |
| 66 | @@ -592,7 +592,7 @@ | |
| 67 | int ret; | |
| 68 | *mod_data = (void *)1; | |
| 69 | ||
| 70 | - ret=session_mysql_connect(); | |
| 71 | + ret=session_mysql_connect(TSRMLS_C); | |
| 72 | if (SESSION_MYSQL_G(quiet)) { | |
| 73 | return SUCCESS; | |
| 74 | } else { | |
| 75 | @@ -607,7 +607,7 @@ | |
| 76 | { | |
| 77 | *mod_data = (void *)0; | |
| 78 | ||
| 79 | - session_mysql_close(); | |
| 80 | + session_mysql_close(TSRMLS_C); | |
| 81 | ||
| 82 | return SUCCESS; | |
| 83 | } | |
| 84 | @@ -619,7 +619,7 @@ | |
| 85 | { | |
| 86 | int ret; | |
| 87 | if (!SESSION_MYSQL_G(mysql)) { | |
| 88 | - if (!session_mysql_connect()){ | |
| 89 | + if (!session_mysql_connect(TSRMLS_C)){ | |
| 90 | return FAILURE; | |
| 91 | } | |
| 92 | } | |
| 93 | @@ -638,7 +638,7 @@ | |
| 94 | int ret; | |
| 95 | ||
| 96 | if (!SESSION_MYSQL_G(mysql)) { | |
| 97 | - if (!session_mysql_connect()){ | |
| 98 | + if (!session_mysql_connect(TSRMLS_C)){ | |
| 99 | if (SESSION_MYSQL_G(quiet)) { | |
| 100 | return SUCCESS; | |
| 101 | } else { | |
| 102 | @@ -664,7 +664,7 @@ | |
| 103 | int ret; | |
| 104 | ||
| 105 | if (!SESSION_MYSQL_G(mysql)) { | |
| 106 | - if (!session_mysql_connect()){ | |
| 107 | + if (!session_mysql_connect(TSRMLS_C)){ | |
| 108 | if (SESSION_MYSQL_G(quiet)) { | |
| 109 | return SUCCESS; | |
| 110 | } else { | |
| 111 | @@ -690,7 +690,7 @@ | |
| 112 | int ret; | |
| 113 | ||
| 114 | if (!SESSION_MYSQL_G(mysql)) { | |
| 115 | - if (!session_mysql_connect()){ | |
| 116 | + if (!session_mysql_connect(TSRMLS_C)){ | |
| 117 | if (SESSION_MYSQL_G(quiet)) { | |
| 118 | return FAILURE; | |
| 119 | } else { | |
| 120 | @@ -699,7 +699,7 @@ | |
| 121 | } | |
| 122 | } | |
| 123 | ||
| 124 | - ret=session_mysql_gc(); | |
| 125 | + ret=session_mysql_gc(TSRMLS_C); | |
| 126 | ||
| 127 | if (SESSION_MYSQL_G(quiet)) { | |
| 128 | return SUCCESS; | |
| 129 | @@ -735,7 +735,7 @@ | |
| 130 | } | |
| 131 | ||
| 132 | if (!SESSION_MYSQL_G(mysql)) { | |
| 133 | - if (!session_mysql_connect()){ | |
| 134 | + if (!session_mysql_connect(TSRMLS_C)){ | |
| 135 | return FAILURE; | |
| 136 | } | |
| 137 | } |