Author: jpeach Date: 2007-05-19 04:23:04 +0000 (Sat, 19 May 2007) New Revision: 23009
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23009 Log: Both contains a strchr_m(server,'/') few lines after replacing all / with \. This patch removes this dead code. Patch from Pascal Terjan <[EMAIL PROTECTED]> for bug #2313. Modified: branches/SAMBA_3_0/source/utils/smbcacls.c branches/SAMBA_3_0/source/utils/smbcquotas.c branches/SAMBA_3_0_26/source/utils/smbcacls.c branches/SAMBA_3_0_26/source/utils/smbcquotas.c Changeset: Modified: branches/SAMBA_3_0/source/utils/smbcacls.c =================================================================== --- branches/SAMBA_3_0/source/utils/smbcacls.c 2007-05-19 02:52:14 UTC (rev 23008) +++ branches/SAMBA_3_0/source/utils/smbcacls.c 2007-05-19 04:23:04 UTC (rev 23009) @@ -902,11 +902,8 @@ fstrcpy(server,path+2); share = strchr_m(server,'\\'); if (!share) { - share = strchr_m(server,'/'); - if (!share) { - printf("Invalid argument: %s\n", share); - return -1; - } + printf("Invalid argument: %s\n", share); + return -1; } *share = 0; Modified: branches/SAMBA_3_0/source/utils/smbcquotas.c =================================================================== --- branches/SAMBA_3_0/source/utils/smbcquotas.c 2007-05-19 02:52:14 UTC (rev 23008) +++ branches/SAMBA_3_0/source/utils/smbcquotas.c 2007-05-19 04:23:04 UTC (rev 23009) @@ -500,11 +500,8 @@ pstrcpy(server,path+2); share = strchr_m(server,'\\'); if (!share) { - share = strchr_m(server,'/'); - if (!share) { - printf("Invalid argument: %s\n", share); - exit(EXIT_PARSE_ERROR); - } + printf("Invalid argument: %s\n", share); + exit(EXIT_PARSE_ERROR); } *share = 0; Modified: branches/SAMBA_3_0_26/source/utils/smbcacls.c =================================================================== --- branches/SAMBA_3_0_26/source/utils/smbcacls.c 2007-05-19 02:52:14 UTC (rev 23008) +++ branches/SAMBA_3_0_26/source/utils/smbcacls.c 2007-05-19 04:23:04 UTC (rev 23009) @@ -902,11 +902,8 @@ fstrcpy(server,path+2); share = strchr_m(server,'\\'); if (!share) { - share = strchr_m(server,'/'); - if (!share) { - printf("Invalid argument: %s\n", share); - return -1; - } + printf("Invalid argument: %s\n", share); + return -1; } *share = 0; Modified: branches/SAMBA_3_0_26/source/utils/smbcquotas.c =================================================================== --- branches/SAMBA_3_0_26/source/utils/smbcquotas.c 2007-05-19 02:52:14 UTC (rev 23008) +++ branches/SAMBA_3_0_26/source/utils/smbcquotas.c 2007-05-19 04:23:04 UTC (rev 23009) @@ -500,11 +500,8 @@ pstrcpy(server,path+2); share = strchr_m(server,'\\'); if (!share) { - share = strchr_m(server,'/'); - if (!share) { - printf("Invalid argument: %s\n", share); - exit(EXIT_PARSE_ERROR); - } + printf("Invalid argument: %s\n", share); + exit(EXIT_PARSE_ERROR); } *share = 0;
