]> granicus.if.org Git - php/commitdiff
Be consistent with hashed_details behavior.
authorJoey Smith <joey@php.net>
Tue, 17 Jul 2001 08:16:58 +0000 (08:16 +0000)
committerJoey Smith <joey@php.net>
Tue, 17 Jul 2001 08:16:58 +0000 (08:16 +0000)
ext/sybase/php_sybase_db.c

index 3a5cd3382f83b7ba2b78891928d02661b1d09b85..9ed3cef5f81c8be17ae203165e5584ccb8dac199 100644 (file)
@@ -282,9 +282,9 @@ static void php_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
                                }
                                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 @@ static void php_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
                                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 @@ static void php_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
                                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 @@ static void php_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
                                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 */
                        }