s4-torture: simplify smb2_util_oplock_level(), it's always called with only one option.
authorGünther Deschner <gd@samba.org>
Tue, 19 Jan 2016 13:53:20 +0000 (14:53 +0100)
committerGünther Deschner <gd@samba.org>
Mon, 25 Jun 2018 12:56:38 +0000 (14:56 +0200)
Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
source4/torture/smb2/util.c

index 1108a66e39931454a5ab95f18362e63e33f61359..be184a3710bcaf6ece3bf34bae1aec97689575ab 100644 (file)
@@ -754,19 +754,20 @@ uint32_t smb2_util_share_access(const char *sharemode)
 uint8_t smb2_util_oplock_level(const char *op)
 {
        uint8_t val = SMB2_OPLOCK_LEVEL_NONE;
-       int i;
 
-       for (i = 0; i < strlen(op); i++) {
-               switch (op[i]) {
-               case 's':
-                       return SMB2_OPLOCK_LEVEL_II;
-               case 'x':
-                       return SMB2_OPLOCK_LEVEL_EXCLUSIVE;
-               case 'b':
-                       return SMB2_OPLOCK_LEVEL_BATCH;
-               default:
-                       continue;
-               }
+       if (op == NULL) {
+               return val;
+       }
+
+       switch (op[0]) {
+       case 's':
+               return SMB2_OPLOCK_LEVEL_II;
+       case 'x':
+               return SMB2_OPLOCK_LEVEL_EXCLUSIVE;
+       case 'b':
+               return SMB2_OPLOCK_LEVEL_BATCH;
+       default:
+               break;
        }
 
        return val;