cvs: php4 /ext/sybase php_sybase_db.c

joey Tue Jul 17 04:16:57 2001 EDT Modified files: /php4/ext/sybase php_sybase_db.c Log: Be consistent with hashed_details behavior. Index: php4/ext/sybase/php_sybase_db.c diff -u php4/ext/sybase/php_sybase_db.c:1.19 php4/ext/sybase/php_sybase_db.c:1.20 --- php4/ext/sybase/php_sybase_db.c:1.19 Wed Jul 11 08:42:24 2001 +++ php4/ext/sybase/php_sybase_db.c Tue Jul 17 04:16:56 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_db.c,v 1.19 2001/07/11 12:42:24 thies Exp $ */ +/* $Id: php_sybase_db.c,v 1.20 2001/07/17 08:16:56 joey Exp $ */ #ifdef HAVE_CONFIG_H @@ -282,9 +282,9 @@ } convert_to_string(yyhost); host = yyhost->value.str.val; - hashed_details_length = yyhost->value.str.len+6+3; + hashed_details_length = yyhost->value.str.len+6+4; hashed_details = (char *) emalloc(hashed_details_length+1); - sprintf(hashed_details,"sybase_%s__",yyhost->value.str.val); + sprintf(hashed_details,"sybase_%s___",yyhost->value.str.val); } break; case 2: { @@ -297,9 +297,9 @@ convert_to_string(yyuser); host = yyhost->value.str.val; user = yyuser->value.str.val; - hashed_details_length = yyhost->value.str.len+yyuser->value.str.len+6+3; + hashed_details_length = yyhost->value.str.len+yyuser->value.str.len+6+4; hashed_details = (char *) emalloc(hashed_details_length+1); - sprintf(hashed_details,"sybase_%s_%s_",yyhost->value.str.val,yyuser->value.str.val); + sprintf(hashed_details,"sybase_%s_%s__",yyhost->value.str.val,yyuser->value.str.val); } break; case 3: { @@ -314,9 +314,9 @@ host = yyhost->value.str.val; user = yyuser->value.str.val; passwd = yypasswd->value.str.val; - hashed_details_length = yyhost->value.str.len+yyuser->value.str.len+yypasswd->value.str.len+6+3; + hashed_details_length = yyhost->value.str.len+yyuser->value.str.len+yypasswd->value.str.len+6+4; hashed_details = (char *) emalloc(hashed_details_length+1); - sprintf(hashed_details,"sybase_%s_%s_%s",yyhost->value.str.val,yyuser->value.str.val,yypasswd->value.str.val); /* SAFE */ + sprintf(hashed_details,"sybase_%s_%s_%s_",yyhost->value.str.val,yyuser->value.str.val,yypasswd->value.str.val); /* SAFE */ } break; case 4: { @@ -333,7 +333,7 @@ user = yyuser->value.str.val; passwd = yypasswd->value.str.val; charset = yycharset->value.str.val; - hashed_details_length = yyhost->value.str.len+yyuser->value.str.len+yypasswd->value.str.len+yycharset->value.str.len+6+3; + hashed_details_length = yyhost->value.str.len+yyuser->value.str.len+yypasswd->value.str.len+yycharset->value.str.len+6+4; hashed_details = (char *) emalloc(hashed_details_length+1); sprintf(hashed_details,"sybase_%s_%s_%s_%s",yyhost->value.str.val,yyuser->value.str.val,yypasswd->value.str.val,yycharset->value.str.val); /* SAFE */ }