cvs: php4 /ext/mhash mhash.c

sas Wed Nov 22 13:52:54 2000 EDT Modified files: /php4/ext/mhash mhash.c Log: Avoid estrdup and a couple of other minor cleanups Index: php4/ext/mhash/mhash.c diff -u php4/ext/mhash/mhash.c:1.23 php4/ext/mhash/mhash.c:1.24 --- php4/ext/mhash/mhash.c:1.23 Wed Nov 22 13:46:03 2000 +++ php4/ext/mhash/mhash.c Wed Nov 22 13:52:53 2000 @@ -164,12 +164,10 @@ php_error(E_WARNING, MHASH_FAILED_MSG); RETURN_FALSE; } - td = - mhash_hmac_init(Z_LVAL_PP(hash), + td = mhash_hmac_init(Z_LVAL_PP(hash), Z_STRVAL_PP(key), Z_STRLEN_PP(key), - mhash_get_hash_pblock((*hash)->value. - lval)); + mhash_get_hash_pblock(Z_LVAL_PP(hash))); } else { td = mhash_init(Z_LVAL_PP(hash)); } @@ -249,19 +247,18 @@ keystruct.salt = salt; keystruct.salt_size = salt_len; - ret = malloc(size); + ret = emalloc(size); if (ret==NULL) { php_error(E_WARNING, MHASH_KEYGEN_FAILED_MSG); RETURN_FALSE; } val = mhash_keygen_ext( KEYGEN_S2K_SALTED, keystruct, ret, size, password, password_len); - if ( val >= 0) { - RETVAL_STRINGL(ret, size, 1); - free(ret); + if (val >= 0) { + RETVAL_STRINGL(ret, size, 0); } else { php_error(E_WARNING, MHASH_KEYGEN_FAILED_MSG); - free(ret); + efree(ret); RETURN_FALSE; } }