diff options
| author | Sascha Schumann <sas@php.net> | 1999-09-24 19:35:25 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 1999-09-24 19:35:25 +0000 |
| commit | 7a1fff14410643c5a5de41224b65589e5acfdbeb (patch) | |
| tree | dfa0d86179b8d8166b4ba097205d1f52b3f8639f /ext/standard/crypt.c | |
| parent | d8895c02f79fd0b1f58352b4d8930442a111008e (diff) | |
| download | php-git-7a1fff14410643c5a5de41224b65589e5acfdbeb.tar.gz | |
Use new Zend API.
Diffstat (limited to 'ext/standard/crypt.c')
| -rw-r--r-- | ext/standard/crypt.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c index aa71099382..35f3e81466 100644 --- a/ext/standard/crypt.c +++ b/ext/standard/crypt.c @@ -120,7 +120,7 @@ static void php3i_to64(char *s, long v, int n) { PHP_FUNCTION(crypt) { char salt[PHP3_MAX_SALT_LEN+1]; - pval *arg1, *arg2; + pval **arg1, **arg2; salt[0]=salt[PHP3_MAX_SALT_LEN]='\0'; /* This will produce suitable results if people depend on DES-encryption @@ -129,22 +129,22 @@ PHP_FUNCTION(crypt) switch (ARG_COUNT(ht)) { case 1: - if (getParameters(ht, 1, &arg1)==FAILURE) { + if (getParametersEx(1, &arg1)==FAILURE) { RETURN_FALSE; } break; case 2: - if (getParameters(ht, 2, &arg1, &arg2)==FAILURE) { + if (getParametersEx(2, &arg1, &arg2)==FAILURE) { RETURN_FALSE; } - convert_to_string(arg2); - memcpy(salt, arg2->value.str.val, MIN(PHP3_MAX_SALT_LEN,arg2->value.str.len)); + convert_to_string_ex(arg2); + memcpy(salt, (*arg2)->value.str.val, MIN(PHP3_MAX_SALT_LEN,(*arg2)->value.str.len)); break; default: WRONG_PARAM_COUNT; break; } - convert_to_string(arg1); + convert_to_string_ex(arg1); /* The automatic salt generation only covers standard DES and md5-crypt */ if(!*salt) { @@ -171,7 +171,7 @@ PHP_FUNCTION(crypt) #endif } - return_value->value.str.val = (char *) crypt(arg1->value.str.val, salt); + return_value->value.str.val = (char *) crypt((*arg1)->value.str.val, salt); return_value->value.str.len = strlen(return_value->value.str.val); return_value->type = IS_STRING; pval_copy_constructor(return_value); |