r23784: use the GPLv3 boilerplate as recommended by the FSF and the license text

[tprouty/samba.git] / source / lib / util_unistr.c

diff --git a/source/lib/util_unistr.c b/source/lib/util_unistr.c
index 84e4cf3f83ef62c131ee2b63173cca79275a135b..a4952d137ee04e776e370e86f7185090751a8dbc 100644 (file)
--- a/source/lib/util_unistr.c
+++ b/source/lib/util_unistr.c
@@ -7,7 +7,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
@@ -484,7 +483,7 @@ size_t strnlen_w(const smb_ucs2_t *src, size_t max)
        size_t len;
        smb_ucs2_t c;
 
-       for(len = 0; *(COPY_UCS2_CHAR(&c,src)) && (len < max); src++, len++) {
+       for(len = 0; (len < max) && *(COPY_UCS2_CHAR(&c,src)); src++, len++) {
                ;
        }