vfs_fruit: static string fruit_catia_maps
authorRalph Boehme <slow@samba.org>
Tue, 10 Oct 2017 17:13:36 +0000 (19:13 +0200)
committerKarolin Seeger <kseeger@samba.org>
Wed, 25 Oct 2017 06:43:05 +0000 (08:43 +0200)
In a later commit these will be used somewhere else too.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=13076

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
(cherry picked from commit ce516a34972f51eda48c1536858d47dc230ea99a)

source3/modules/vfs_fruit.c

index 8e3c466f5b069e9711c667a8aa93910c9d9d767d..05ecd828efd92e896d17dff52d681d65967469e7 100644 (file)
@@ -177,6 +177,19 @@ static const struct enum_list fruit_encoding[] = {
        { -1, NULL}
 };
 
+static const char *fruit_catia_maps =
+       "0x01:0xf001,0x02:0xf002,0x03:0xf003,0x04:0xf004,"
+       "0x05:0xf005,0x06:0xf006,0x07:0xf007,0x08:0xf008,"
+       "0x09:0xf009,0x0a:0xf00a,0x0b:0xf00b,0x0c:0xf00c,"
+       "0x0d:0xf00d,0x0e:0xf00e,0x0f:0xf00f,0x10:0xf010,"
+       "0x11:0xf011,0x12:0xf012,0x13:0xf013,0x14:0xf014,"
+       "0x15:0xf015,0x16:0xf016,0x17:0xf017,0x18:0xf018,"
+       "0x19:0xf019,0x1a:0xf01a,0x1b:0xf01b,0x1c:0xf01c,"
+       "0x1d:0xf01d,0x1e:0xf01e,0x1f:0xf01f,"
+       "0x22:0xf020,0x2a:0xf021,0x3a:0xf022,0x3c:0xf023,"
+       "0x3e:0xf024,0x3f:0xf025,0x5c:0xf026,0x7c:0xf027,"
+       "0x0d:0xf00d";
+
 /*****************************************************************************
  * Defines, functions and data structures that deal with AppleDouble
  *****************************************************************************/
@@ -2828,20 +2841,9 @@ static int fruit_connect(vfs_handle_struct *handle,
        }
 
        if (config->encoding == FRUIT_ENC_NATIVE) {
-               lp_do_parameter(
-                       SNUM(handle->conn),
-                       "catia:mappings",
-                       "0x01:0xf001,0x02:0xf002,0x03:0xf003,0x04:0xf004,"
-                       "0x05:0xf005,0x06:0xf006,0x07:0xf007,0x08:0xf008,"
-                       "0x09:0xf009,0x0a:0xf00a,0x0b:0xf00b,0x0c:0xf00c,"
-                       "0x0d:0xf00d,0x0e:0xf00e,0x0f:0xf00f,0x10:0xf010,"
-                       "0x11:0xf011,0x12:0xf012,0x13:0xf013,0x14:0xf014,"
-                       "0x15:0xf015,0x16:0xf016,0x17:0xf017,0x18:0xf018,"
-                       "0x19:0xf019,0x1a:0xf01a,0x1b:0xf01b,0x1c:0xf01c,"
-                       "0x1d:0xf01d,0x1e:0xf01e,0x1f:0xf01f,"
-                       "0x22:0xf020,0x2a:0xf021,0x3a:0xf022,0x3c:0xf023,"
-                       "0x3e:0xf024,0x3f:0xf025,0x5c:0xf026,0x7c:0xf027,"
-                       "0x0d:0xf00d");
+               lp_do_parameter(SNUM(handle->conn),
+                               "catia:mappings",
+                               fruit_catia_maps);
        }
 
        return rc;