Change all occurrences of 'flavour' to 'flavor'
Subsystems (2)
PATCH 1/1 Change all occurrences of 'flavour' to 'flavor'
Hello,
This patch is a followup to changeset 1.1046.1.459,
It changes all occurrences of 'flavour' to 'flavor' in the complete tree; I've just comiled all affected files (that is, the config resulting from make allyesconfig minus already broken stuff) succesfully on i386.
Andries, I did a small check if mount uses the fieldnames frrom the kernel headers, which doesn't seem to be the case, can you confirm that this?
------------------
This BitKeeper patch contains the following changesets:
1.1126
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: jasper # Host: vs19.net # Root: /home/spaans/bk/linux-jsp
#
#--- 1.134/fs/ntfs/super.c Fri Aug 1 01:53:11 2003
#+++ 1.135/fs/ntfs/super.c Thu Aug 7 16:48:50 2003
#@@ -1283,7 +1283,7 @@
# sfs->f_ffree = __get_nr_free_mft_records(vol);
# up_read(&vol->mftbmp_lock);
# /*
#- * File system id. This is extremely *nix flavour dependent and even
#+ * File system id. This is extremely *nix flavor dependent and even
# * within Linux itself all fs do their own thing. I interpret this to
# * mean a unique id associated with the mounted fs and not the id
# * associated with the file system driver, the latter is already given
#
#--- 1.19/arch/i386/kernel/cpu/intel.c Wed Apr 30 10:07:11 2003
#+++ 1.20/arch/i386/kernel/cpu/intel.c Thu Aug 7 16:48:50 2003
#@@ -363,7 +363,7 @@
#
# static unsigned int intel_size_cache(struct cpuinfo_x86 * c, unsigned int size)
# {
#- /* Intel PIII Tualatin. This comes in two flavours.
#+ /* Intel PIII Tualatin. This comes in two flavors.
# * One has 256kb of cache, the other 512. We have no way
# * to determine which, so we use a boottime override
# * for the 512kb model, and assume 256 otherwise.
#
#--- 1.16/include/net/sctp/constants.h Mon Aug 4 19:35:39 2003
#+++ 1.17/include/net/sctp/constants.h Thu Aug 7 16:48:50 2003
#@@ -79,7 +79,7 @@
# #define SCTP_CID_ADDIP_MAX SCTP_CID_ASCONF_ACK
# #define SCTP_NUM_ADDIP_CHUNK_TYPES 2
#
#-/* These are the different flavours of event. */
#+/* These are the different flavors of event. */
# typedef enum {
#
# SCTP_EVENT_T_CHUNK = 1,
#
#--- 1.20/net/sunrpc/svcauth_unix.c Fri Jun 27 06:21:42 2003
#+++ 1.21/net/sunrpc/svcauth_unix.c Thu Aug 7 16:48:50 2003
#@@ -43,7 +43,7 @@
# rv = auth_domain_lookup(&ud, 0);
#
# foundit:
#- if (rv && rv->flavour != RPC_AUTH_UNIX) {
#+ if (rv && rv->flavor != RPC_AUTH_UNIX) {
# auth_domain_put(rv);
# return NULL;
# }
#@@ -54,7 +54,7 @@
# cache_init(&new->h.h);
# atomic_inc(&new->h.h.refcnt);
# new->h.name = strdup(name);
#- new->h.flavour = RPC_AUTH_UNIX;
#+ new->h.flavor = RPC_AUTH_UNIX;
# new->addr_changes = 0;
# new->h.h.expiry_time = NEVER;
# new->h.h.flags = 0;
#@@ -263,7 +263,7 @@
# struct unix_domain *udom;
# struct ip_map ip, *ipmp;
#
#- if (dom->flavour != RPC_AUTH_UNIX)
#+ if (dom->flavor != RPC_AUTH_UNIX)
# return -EINVAL;
# udom = container_of(dom, struct unix_domain, h);
# ip.m_class = "nfsd";
#@@ -285,7 +285,7 @@
# {
# struct unix_domain *udom;
#
#- if (dom->flavour != RPC_AUTH_UNIX)
#+ if (dom->flavor != RPC_AUTH_UNIX)
# return -EINVAL;
# udom = container_of(dom, struct unix_domain, h);
# udom->addr_changes++;
#@@ -400,7 +400,7 @@
#
# struct auth_ops svcauth_null = {
# .name = "null",
#- .flavour = RPC_AUTH_NULL,
#+ .flavor = RPC_AUTH_NULL,
# .accept = svcauth_null_accept,
# .release = svcauth_null_release,
# };
#@@ -501,7 +501,7 @@
#
# struct auth_ops svcauth_unix = {
# .name = "unix",
#- .flavour = RPC_AUTH_UNIX,
#+ .flavor = RPC_AUTH_UNIX,
# .accept = svcauth_unix_accept,
# .release = svcauth_unix_release,
# .domain_release = svcauth_unix_domain_release,
#
#--- 1.9/Documentation/s390/Debugging390.txt Tue Mar 11 19:20:18 2003
#+++ 1.10/Documentation/s390/Debugging390.txt Thu Aug 7 16:48:50 2003
#@@ -1666,7 +1666,7 @@
# CCWS are linked lists of instructions initially pointed to by an operation request block (ORB),
# which is initially given to Start Subchannel (SSCH) command along with the subchannel number
# for the IO subsystem to process while the CPU continues executing normal code.
#-These come in two flavours, Format 0 ( 24 bit for backward )
#+These come in two flavors, Format 0 ( 24 bit for backward )
# compatibility & Format 1 ( 31 bit ). These are typically used to issue read & write
# ( & many other instructions ) they consist of a length field & an absolute address field.
# For each IO typically get 1 or 2 interrupts one for channel end ( primary status ) when the
#@@ -1741,7 +1741,7 @@
# IOP = IP Processor
# CU = Control Unit
#
#-The 390 IO systems come in 2 flavours the current 390 machines support both
#+The 390 IO systems come in 2 flavors the current 390 machines support both
#
# The Older 360 & 370 Interface,sometimes called the paralell I/O interface,
# sometimes called Bus-and Tag & sometimes Original Equipment Manufacturers
#
#--- 1.21/fs/sysv/super.c Mon May 26 04:21:25 2003
#+++ 1.22/fs/sysv/super.c Thu Aug 7 16:48:50 2003
#@@ -264,7 +264,7 @@
# static struct {
# int block;
# int (*test)(struct sysv_sb_info *, struct buffer_head *);
#-} flavours[] = {
#+} flavors[] = {
# {1, detect_xenix},
# {0, detect_sysv},
# {0, detect_coherent},
#@@ -273,7 +273,7 @@
# {18,detect_sysv},
# };
#
#-static char *flavour_names[] = {
#+static char *flavor_names[] = {
# [FSTYPE_XENIX] = "Xenix",
# [FSTYPE_SYSV4] = "SystemV",
# [FSTYPE_SYSV2] = "SystemV Release 2",
#@@ -282,7 +282,7 @@
# [FSTYPE_AFS] = "AFS",
# };
#
#-static void (*flavour_setup[])(struct sysv_sb_info *) = {
#+static void (*flavor_setup[])(struct sysv_sb_info *) = {
# [FSTYPE_XENIX] = detected_xenix,
# [FSTYPE_SYSV4] = detected_sysv4,
# [FSTYPE_SYSV2] = detected_sysv2,
#@@ -295,14 +295,14 @@
# {
# struct sysv_sb_info *sbi = SYSV_SB(sb);
# struct inode *root_inode;
#- char *found = flavour_names[sbi->s_type];
#+ char *found = flavor_names[sbi->s_type];
# u_char n_bits = size+8;
# int bsize = 1 << n_bits;
# int bsize_4 = bsize >> 2;
#
# sbi->s_firstinodezone = 2;
#
#- flavour_setup[sbi->s_type](sbi);
#+ flavor_setup[sbi->s_type](sbi);
#
# sbi->s_truncate = 1;
# sbi->s_ndatazones = sbi->s_nzones - sbi->s_firstdatazone;
#@@ -371,12 +371,12 @@
#
# sb_set_blocksize(sb, BLOCK_SIZE);
#
#- for (i = 0; i < sizeof(flavours)/sizeof(flavours[0]) && !size; i++) {
#+ for (i = 0; i < sizeof(flavors)/sizeof(flavors[0]) && !size; i++) {
# brelse(bh);
#- bh = sb_bread(sb, flavours[i].block);
#+ bh = sb_bread(sb, flavors[i].block);
# if (!bh)
# continue;
#- size = flavours[i].test(SYSV_SB(sb), bh);
#+ size = flavors[i].test(SYSV_SB(sb), bh);
# }
#
# if (!size)
#
#--- 1.1/arch/mips/kernel/scall32-o32.S Fri Aug 1 07:39:47 2003
#+++ 1.2/arch/mips/kernel/scall32-o32.S Thu Aug 7 16:48:50 2003
#@@ -19,7 +19,7 @@
# #include <asm/unistd.h>
# #include <asm/offset.h>
#
#-/* Highest syscall used of any syscall flavour */
#+/* Highest syscall used of any syscall flavor */
# #define MAX_SYSCALL_NO __NR_O32_Linux + __NR_O32_Linux_syscalls
#
# .align 5
#@@ -338,10 +338,10 @@
# .endm
#
# .macro syscalltable
#- mille sys_ni_syscall 0 /* 0 - 999 SVR4 flavour */
#+ mille sys_ni_syscall 0 /* 0 - 999 SVR4 flavor */
# #include "irix5sys.h" /* 1000 - 1999 32-bit IRIX */
#- mille sys_ni_syscall 0 /* 2000 - 2999 BSD43 flavour */
#- mille sys_ni_syscall 0 /* 3000 - 3999 POSIX flavour */
#+ mille sys_ni_syscall 0 /* 2000 - 2999 BSD43 flavor */
#+ mille sys_ni_syscall 0 /* 3000 - 3999 POSIX flavor */
#
# sys sys_syscall 0 /* 4000 */
# sys sys_exit 1
#
#--- 1.2/arch/mips/mm-32/pg-r4k.S Mon Jul 28 13:57:51 2003
#+++ 1.3/arch/mips/mm-32/pg-r4k.S Thu Aug 7 16:48:50 2003
#@@ -28,7 +28,7 @@
# /*
# * Zero an entire page. Basically a simple unrolled loop should do the
# * job but we want more performance by saving memory bus bandwidth. We
#- * have five flavours of the routine available for:
#+ * have five flavors of the routine available for:
# *
# * - 16byte cachelines and no second level cache
# * - 32byte cachelines second level cache
#@@ -112,7 +112,7 @@
# END(r4k_clear_page_d32)
#
# /*
#- * This flavour of r4k_clear_page is for the R4600 V1.x. Cite from the
#+ * This flavor of r4k_clear_page is for the R4600 V1.x. Cite from the
# * IDT R4600 V1.7 errata:
# *
# * 18. The CACHE instructions Hit_Writeback_Invalidate_D, Hit_Writeback_D,
#
#--- 1.2/arch/mips/mm-64/pg-r4k.c Mon Jul 28 13:57:51 2003
#+++ 1.3/arch/mips/mm-64/pg-r4k.c Thu Aug 7 16:48:50 2003
#@@ -25,7 +25,7 @@
# /*
# * Zero an entire page. Basically a simple unrolled loop should do the
# * job but we want more performance by saving memory bus bandwidth. We
#- * have five flavours of the routine available for:
#+ * have five flavors of the routine available for:
# *
# * - 16byte cachelines and no second level cache
# * - 32byte cachelines second level cache
#@@ -89,7 +89,7 @@
#
#
# /*
#- * This flavour of r4k_clear_page is for the R4600 V1.x. Cite from the
#+ * This flavor of r4k_clear_page is for the R4600 V1.x. Cite from the
# * IDT R4600 V1.7 errata:
# *
# * 18. The CACHE instructions Hit_Writeback_Invalidate_D, Hit_Writeback_D,
#
#--- 1.28/kernel/futex.c Mon May 26 05:39:28 2003
#+++ 1.29/kernel/futex.c Thu Aug 7 16:48:50 2003
#@@ -10,7 +10,7 @@
# * Kirkwood for proof-of-concept implementation.
# *
# * "The futexes are also cursed."
#- * "But they come in a choice of three flavours!"
#+ * "But they come in a choice of three flavors!"
# *
# * 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
#
#--- 1.2/arch/sparc/math-emu/math.c Fri Feb 7 09:20:33 2003
#+++ 1.3/arch/sparc/math-emu/math.c Thu Aug 7 16:48:50 2003
#@@ -37,7 +37,7 @@
# * Finally, sfp-machine.h is the machine dependent part of the
# * code: it defines the word size and what type a word is. It also
# * defines how _FP_MUL_MEAT_t() maps to _FP_MUL_MEAT_n_* : op-n.h
#- * provide several possible flavours of multiply algorithm, most
#+ * provide several possible flavors of multiply algorithm, most
# * of which require that you supply some form of asm or C primitive to
# * do the actual multiply. (such asm primitives should be defined
# * in sfp-machine.h too). udivmodti4.c is the same sort of thing.
#
#--- 1.8/drivers/char/ftape/zftape/zftape-ctl.c Fri Mar 14 01:52:15 2003
#+++ 1.9/drivers/char/ftape/zftape/zftape-ctl.c Thu Aug 7 16:48:50 2003
#@@ -125,7 +125,7 @@
# * compression map. We therefor simply
# * position at the beginning of the first
# * volume. This covers old ftape archives as
#- * well has various flavours of the
#+ * well has various flavors of the
# * compression map segments. The worst case is
# * that the compression map shows up as a
# * additional volume in front of all others.
#
#--- 1.5/drivers/isdn/eicon/adapter.h Mon Feb 24 18:56:02 2003
#+++ 1.6/drivers/isdn/eicon/adapter.h Thu Aug 7 16:48:50 2003
#@@ -125,7 +125,7 @@
# dia_config_t DivasCardConfigs[];
#
# extern
#-byte DivasFlavourConfig[];
#+byte DivasFlavorConfig[];
#
# /*------------------------------------------------------------------*/
# /* public functions of IDI common code */
#
#--- 1.9/drivers/net/7990.c Mon Apr 28 05:36:18 2003
#+++ 1.10/drivers/net/7990.c Thu Aug 7 16:48:50 2003
#@@ -51,7 +51,7 @@
# */
# #define DECLARE_LL /* nothing to declare */
#
#-/* debugging output macros, various flavours */
#+/* debugging output macros, various flavors */
# /* #define TEST_HITS */
# #ifdef UNDEF
# #define PRINT_RINGS() \
#
#--- 1.25/drivers/net/ewrk3.c Sun May 25 23:08:16 2003
#+++ 1.26/drivers/net/ewrk3.c Thu Aug 7 16:48:50 2003
#@@ -36,7 +36,7 @@
# and is deprecated in this driver, although allowed to provide initial
# setup when hardstrapped.
#
#- The shared memory mode comes in 3 flavours: 2kB, 32kB and 64kB. There is
#+ The shared memory mode comes in 3 flavors: 2kB, 32kB and 64kB. There is
# no point in using any mode other than the 2kB mode - their performances
# are virtually identical, although the driver has been tested in the 2kB
# and 32kB modes. I would suggest you uncomment the line:
#
#--- 1.84/fs/nfs/inode.c Thu Jul 17 19:40:29 2003
#+++ 1.85/fs/nfs/inode.c Thu Aug 7 16:48:50 2003
#@@ -1354,7 +1354,7 @@
# struct rpc_xprt *xprt = NULL;
# struct rpc_clnt *clnt = NULL;
# struct rpc_timeout timeparms;
#- rpc_authflavor_t authflavour;
#+ rpc_authflavor_t authflavor;
# int proto, err = -EIO;
#
# sb->s_blocksize_bits = 0;
#@@ -1407,17 +1407,17 @@
# goto out_fail;
# }
#
#- authflavour = RPC_AUTH_UNIX;
#- if (data->auth_flavourlen != 0) {
#- if (data->auth_flavourlen > 1)
#- printk(KERN_INFO "NFS: cannot yet deal with multiple auth flavours.\n");
#- if (copy_from_user(&authflavour, data->auth_flavours, sizeof(authflavour))) {
#+ authflavor = RPC_AUTH_UNIX;
#+ if (data->auth_flavorlen != 0) {
#+ if (data->auth_flavorlen > 1)
#+ printk(KERN_INFO "NFS: cannot yet deal with multiple auth flavors.\n");
#+ if (copy_from_user(&authflavor, data->auth_flavors, sizeof(authflavor))) {
# err = -EFAULT;
# goto out_fail;
# }
# }
# clnt = rpc_create_client(xprt, server->hostname, &nfs_program,
#- server->rpc_ops->version, authflavour);
#+ server->rpc_ops->version, authflavor);
# if (clnt == NULL) {
# printk(KERN_WARNING "NFS: cannot create RPC client.\n");
# xprt_destroy(xprt);
#@@ -1441,7 +1441,7 @@
# if ((server->idmap = nfs_idmap_new(server)) == NULL)
# printk(KERN_WARNING "NFS: couldn't start IDmap\n");
#
#- err = nfs_sb_init(sb, authflavour);
#+ err = nfs_sb_init(sb, authflavor);
# if (err == 0)
# return 0;
# rpciod_down();
#
#--- 1.10/fs/partitions/check.h Tue Apr 29 23:42:50 2003
#+++ 1.11/fs/partitions/check.h Thu Aug 7 16:48:50 2003
#@@ -32,5 +32,5 @@
#
# extern void parse_bsd(struct parsed_partitions *state,
# struct block_device *bdev, u32 offset, u32 size,
#- int origin, char *flavour, int max_partitions);
#+ int origin, char *flavor, int max_partitions);
#
#
#--- 1.20/fs/partitions/msdos.c Tue May 27 02:48:43 2003
#+++ 1.21/fs/partitions/msdos.c Thu Aug 7 16:48:50 2003
#@@ -209,7 +209,7 @@
# */
# void
# parse_bsd(struct parsed_partitions *state, struct block_device *bdev,
#- u32 offset, u32 size, int origin, char *flavour,
#+ u32 offset, u32 size, int origin, char *flavor,
# int max_partitions)
# {
# Sector sect;
#@@ -223,7 +223,7 @@
# put_dev_sector(sect);
# return;
# }
#- printk(" %s%d: <%s:", state->name, origin, flavour);
#+ printk(" %s%d: <%s:", state->name, origin, flavor);
#
# if (le16_to_cpu(l->d_npartitions) < max_partitions)
# max_partitions = le16_to_cpu(l->d_npartitions);
#
#--- 1.5/include/asm-i386/types.h Sat May 17 23:09:33 2003
#+++ 1.6/include/asm-i386/types.h Thu Aug 7 16:48:50 2003
#@@ -49,7 +49,7 @@
# typedef signed long long s64;
# typedef unsigned long long u64;
#
#-/* DMA addresses come in generic and 64-bit flavours. */
#+/* DMA addresses come in generic and 64-bit flavors. */
#
# #ifdef CONFIG_HIGHMEM64G
# typedef u64 dma_addr_t;
#
#--- 1.4/include/asm-mips/fcntl.h Mon Jul 28 13:57:50 2003
#+++ 1.5/include/asm-mips/fcntl.h Thu Aug 7 16:48:50 2003
#@@ -77,7 +77,7 @@
# #define LOCK_RW 192 /* ... Which allows concurrent read & write ops */
#
# /*
#- * The flavours of struct flock. "struct flock" is the ABI compliant
#+ * The flavors of struct flock. "struct flock" is the ABI compliant
# * variant. Finally struct flock64 is the LFS variant of struct flock. As
# * a historic accident and inconsistence with the ABI definition it doesn't
# * contain all the same fields as struct flock.
#
#--- 1.8/include/asm-mips/unistd.h Tue Jul 29 13:04:55 2003
#+++ 1.9/include/asm-mips/unistd.h Thu Aug 7 16:48:50 2003
#@@ -290,7 +290,7 @@
# #define __NR_utimes (__NR_Linux + 267)
#
# /*
#- * Offset of the last Linux o32 flavoured syscall
#+ * Offset of the last Linux o32 flavored syscall
# */
# #define __NR_Linux_syscalls 267
#
#@@ -534,7 +534,7 @@
# #define __NR_utimes (__NR_Linux + 226)
#
# /*
#- * Offset of the last Linux flavoured syscall
#+ * Offset of the last Linux flavored syscall
# */
# #define __NR_Linux_syscalls 226
#
#@@ -782,7 +782,7 @@
# #define __NR_utimes (__NR_Linux + 231)
#
# /*
#- * Offset of the last N32 flavoured syscall
#+ * Offset of the last N32 flavored syscall
# */
# #define __NR_Linux_syscalls 231
#
#
#--- 1.3/include/asm-sparc64/types.h Tue Dec 31 05:14:21 2002
#+++ 1.4/include/asm-sparc64/types.h Thu Aug 7 16:48:50 2003
#@@ -51,7 +51,7 @@
# typedef __signed__ long s64;
# typedef unsigned long u64;
#
#-/* Dma addresses come in generic and 64-bit flavours. */
#+/* Dma addresses come in generic and 64-bit flavors. */
#
# typedef u32 dma_addr_t;
# typedef u64 dma64_addr_t;
#
#--- 1.2/include/linux/dio.h Fri Jun 7 13:06:42 2002
#+++ 1.3/include/linux/dio.h Thu Aug 7 16:48:50 2003
#@@ -124,7 +124,7 @@
# #define DIO_DESC_SCSI2 "98625A SCSI2"
# #define DIO_ID_SCSI3 0x67 /* ditto */
# #define DIO_DESC_SCSI3 "98625A SCSI3"
#-#define DIO_ID_FBUFFER 0x39 /* framebuffer: flavour is distinguished by secondary ID */
#+#define DIO_ID_FBUFFER 0x39 /* framebuffer: flavor is distinguished by secondary ID */
# #define DIO_DESC_FBUFFER "bitmapped display"
# /* the NetBSD kernel source is a bit unsure as to what these next IDs actually do :-> */
# #define DIO_ID_MISC0 0x03 /* 98622A */
#
#--- 1.24/include/linux/sunrpc/svc.h Tue Jun 24 08:30:35 2003
#+++ 1.25/include/linux/sunrpc/svc.h Thu Aug 7 16:48:50 2003
#@@ -108,7 +108,7 @@
#
# struct svc_serv * rq_server; /* RPC service definition */
# struct svc_procedure * rq_procinfo; /* procedure info */
#- struct auth_ops * rq_authop; /* authentication flavour */
#+ struct auth_ops * rq_authop; /* authentication flavor */
# struct svc_cred rq_cred; /* auth info */
# struct sk_buff * rq_skbuff; /* fast recv inet buffer */
# struct svc_deferred_req*rq_deferred; /* deferred request we are replaying */
#
#--- 1.9/include/linux/sunrpc/svcauth.h Sat Jan 11 02:55:15 2003
#+++ 1.10/include/linux/sunrpc/svcauth.h Thu Aug 7 16:48:50 2003
#@@ -35,7 +35,7 @@
# * For a client, a domain represents a number of servers which all
# * use a common authentication mechanism and network identity name space.
# *
#- * A domain is created by an authentication flavour module based on name
#+ * A domain is created by an authentication flavor module based on name
# * only. Userspace then fills in detail on demand.
# *
# * The creation of a domain typically implies creation of one or
#@@ -44,14 +44,14 @@
# struct auth_domain {
# struct cache_head h;
# char *name;
#- int flavour;
#+ int flavor;
# };
#
# /*
#- * Each authentication flavour registers an auth_ops
#+ * Each authentication flavor registers an auth_ops
# * structure.
# * name is simply the name.
#- * flavour gives the auth flavour. It determines where the flavour is registered
#+ * flavor gives the auth flavor. It determines where the flavor is registered
# * accept() is given a request and should verify it.
# * It should inspect the authenticator and verifier, and possibly the data.
# * If there is a problem with the authentication *authp should be set.
#@@ -82,7 +82,7 @@
# */
# struct auth_ops {
# char * name;
#- int flavour;
#+ int flavor;
# int (*accept)(struct svc_rqst *rq, u32 *authp);
# int (*release)(struct svc_rqst *rq);
# void (*domain_release)(struct auth_domain *);
#
#--- 1.6/net/decnet/dn_fib.c Wed May 7 22:36:49 2003
#+++ 1.7/net/decnet/dn_fib.c Thu Aug 7 16:48:50 2003
#@@ -302,11 +302,11 @@
# struct rtattr *attr = RTA_DATA(rta->rta_mx);
#
# while(RTA_OK(attr, attrlen)) {
#- unsigned flavour = attr->rta_type;
#- if (flavour) {
#- if (flavour > RTAX_MAX)
#+ unsigned flavor = attr->rta_type;
#+ if (flavor) {
#+ if (flavor > RTAX_MAX)
# goto err_inval;
#- fi->fib_metrics[flavour-1] = *(unsigned*)RTA_DATA(attr);
#+ fi->fib_metrics[flavor-1] = *(unsigned*)RTA_DATA(attr);
# }
# attr = RTA_NEXT(attr, attrlen);
# }
#
#--- 1.13/net/ipv6/exthdrs.c Tue Jun 24 10:33:31 2003
#+++ 1.14/net/ipv6/exthdrs.c Thu Aug 7 16:48:50 2003
#@@ -693,7 +693,7 @@
# * processing all preceding ones.
# *
# * We do exactly this. This is a protocol bug. We can't decide after a
#- * seeing an unknown discard-with-error flavour TLV option if it's a
#+ * seeing an unknown discard-with-error flavor TLV option if it's a
# * ICMP error message or not (errors should never be send in reply to
# * ICMP error messages).
# *
#
#--- 1.12/net/sunrpc/svcauth.c Tue Jun 24 05:32:34 2003
#+++ 1.13/net/sunrpc/svcauth.c Thu Aug 7 16:48:50 2003
#@@ -88,7 +88,7 @@
#
# /**************************************************
# * cache for domain name to auth_domain
#- * Entries are only added by flavours which will normally
#+ * Entries are only added by flavors which will normally
# * have a structure that 'inherits' from auth_domain.
# * e.g. when an IP -> domainname is given to auth_unix,
# * and the domain name doesn't exist, it will create a
#@@ -100,7 +100,7 @@
# /*
# * Auth auth_domain cache is somewhat different to other caches,
# * largely because the entries are possibly of different types:
#- * each auth flavour has it's own type.
#+ * each auth flavor has it's own type.
# * One consequence of this that DefineCacheLookup cannot
# * allocate a new structure as it cannot know the size.
# * Notice that the "INIT" code fragment is quite different
#@@ -118,7 +118,7 @@
# {
# struct auth_domain *dom = container_of(item, struct auth_domain, h);
# if (cache_put(item,cd))
#- authtab[dom->flavour]->domain_release(dom);
#+ authtab[dom->flavor]->domain_release(dom);
# }
#
#
#
#--- 1.1/include/linux/nfs4_mount.h Mon Oct 14 20:39:05 2002
#+++ 1.2/include/linux/nfs4_mount.h Thu Aug 7 16:48:50 2003
#@@ -50,9 +50,9 @@
# /* Transport protocol to use */
# int proto; /* 1 */
#
#- /* Pseudo-flavours to use for authentication. See RFC2623 */
#- int auth_flavourlen; /* 1 */
#- int *auth_flavours; /* 1 */
#+ /* Pseudo-flavors to use for authentication. See RFC2623 */
#+ int auth_flavorlen; /* 1 */
#+ int *auth_flavors; /* 1 */
# };
#
# /* bits in the flags field */
#
#--- 1.6/scripts/kconfig/Makefile Sat Mar 15 18:25:56 2003
#+++ 1.7/scripts/kconfig/Makefile Thu Aug 7 16:48:50 2003
#@@ -11,7 +11,7 @@
# #
# #################
#
#-# object files used by all lkc flavours
#+# object files used by all lkc flavors
# libkconfig-objs := zconf.tab.o
#
# host-progs := conf mconf qconf gconf
## Diff checksum=172dea2f
# Patch vers: 1.3
# Patch type: REGULAR
== ChangeSet == [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 [email protected][spaans]|ChangeSet|20030807153159|57503
D 1.1126 03/08/07 17:33:10+02:00 [email protected][spaans] +30 -0
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 C
c diff-flavor
K 44954
P ChangeSet
------------------------------------------------
0a0
Quoted 25 lines
[email protected]|arch/i386/kernel/cpu/intel.c|20020605182529|14299|83fae676fbe78e0d [email protected][spaans]|arch/i386/kernel/cpu/intel.c|20030807153304|22402
[email protected][torvalds]|arch/mips/kernel/scall32-o32.S|20030801053947|63044|4cc5bba7d1ca75a8 [email protected][spaans]|arch/mips/kernel/scall32-o32.S|20030807153304|29937 [email protected][torvalds]|arch/mips/mm/pg-r4k.S|20030623190711|33260|7be7818a2c76f61 [email protected][spaans]|arch/mips/mm-32/pg-r4k.S|20030807153304|65227 [email protected][torvalds]|arch/mips64/mm/pg-r4k.c|20030623190834|25969|ecd0bdbaaedbdc21 [email protected][spaans]|arch/mips/mm-64/pg-r4k.c|20030807153304|54092 [email protected]|arch/sparc/math-emu/math.c|20020205174023|62816|aef85ee6f8e8a0ea [email protected][spaans]|arch/sparc/math-emu/math.c|20030807153304|25276 [email protected]|Documentation/s390/Debugging390.txt|20020205181001|17682|38abccf5c3739022 [email protected][spaans]|Documentation/s390/Debugging390.txt|20030807153304|03371 [email protected]|drivers/char/ftape/zftape/zftape-ctl.c|20020205174005|17560|7242a156fd497a05 [email protected][spaans]|drivers/char/ftape/zftape/zftape-ctl.c|20030807153304|15600 [email protected]|drivers/isdn/eicon/adapter.h|20020205174012|37040|410433d89beedee5 [email protected][spaans]|drivers/isdn/eicon/adapter.h|20030807153304|36911 [email protected]|drivers/net/7990.c|20020205174002|33456|dcb0c81be07ac4be [email protected][spaans]|drivers/net/7990.c|20030807153304|12159 [email protected]|drivers/net/ewrk3.c|20020205174001|13864|cfa24e3bd0cdc03c [email protected][spaans]|drivers/net/ewrk3.c|20030807153304|27724 [email protected]|fs/nfs/inode.c|20020205173938|09363|3f03927acfdbd4a [email protected][spaans]|fs/nfs/inode.c|20030807153304|62737 BK|fs/ntfs/super.c|19700101030959|00024|ae6e00b03ea02889 [email protected][spaans]|fs/ntfs/super.c|20030807153304|22041 [email protected]|fs/partitions/check.h|20020205173939|07282|8bf4113a8485c596 [email protected][spaans]|fs/partitions/check.h|20030807153304|62227 [email protected]|fs/partitions/msdos.c|20020205173939|08398|638b6058a3f829f7 [email protected][spaans]|fs/partitions/msdos.c|20030807153304|11193 [email protected]|fs/sysv/super.c|20020205190830|20794|d2909d10bd7c4d3f [email protected][spaans]|fs/sysv/super.c|20030807153305|46476 [email protected]|include/asm-i386/types.h|20020205173944|26206|8bddf1df4b96d31c [email protected][spaans]|include/asm-i386/types.h|20030807153305|38645 [email protected]|include/asm-mips/fcntl.h|20020205173945|13899|997d88dc30026e54 [email protected][spaans]|include/asm-mips/fcntl.h|20030807153305|61560 [email protected]|include/asm-mips/unistd.h|20020205173944|32413|96869979d8709174 [email protected][spaans]|include/asm-mips/unistd.h|20030807153305|22345 [email protected]|include/asm-sparc64/types.h|20020205173950|51322|8cba6ad8b65b9893 [email protected][spaans]|include/asm-sparc64/types.h|20030807153305|48888 [email protected]|include/linux/dio.h|20020205173942|53841|5d000b7be555bc76 [email protected][spaans]|include/linux/dio.h|20030807153305|40295[email protected][torvalds]|include/linux/nfs4_mount.h|20021016023045|64519|cbcac9fb1bf3e26d [email protected][spaans]|include/linux/nfs4_mount.h|20030807153305|08909 [email protected]|include/linux/sunrpc/svcauth.h|20020205173941|15745|13d0f21c8c263fde [email protected][spaans]|include/linux/sunrpc/svcauth.h|20030807153305|15900 [email protected]|include/linux/sunrpc/svc.h|20020205173941|15025|8e29f1e46c1fd990 [email protected][spaans]|include/linux/sunrpc/svc.h|20030807153305|31867 [email protected]|include/net/sctp/sctp_constants.h|20020819215340|26717|e2f7b309e21a66cf [email protected][spaans]|include/net/sctp/constants.h|20030807153305|50934 [email protected]|kernel/futex.c|20020310195012|48961|39d169578d353bea [email protected][spaans]|kernel/futex.c|20030807153305|14489
Quoted 5 lines
[email protected]|net/decnet/dn_fib.c|20020205173959|01501|b27680a712405bb8 [email protected][spaans]|net/decnet/dn_fib.c|20030807153305|44148 [email protected]|net/ipv6/exthdrs.c|20020205173959|13760|16ff28906231f4a1 [email protected][spaans]|net/ipv6/exthdrs.c|20030807153305|27715 [email protected]|net/sunrpc/svcauth.c|20020205173959|06895|dd2942bf6d6fcda [email protected][spaans]|net/sunrpc/svcauth.c|20030807153305|26770 [email protected][torvalds]|net/sunrpc/svcauth_unix.c|20021012023922|44522|e8927e109738a7a [email protected][spaans]|net/sunrpc/svcauth_unix.c|20030807153305|50092 [email protected][torvalds]|scripts/kconfig/Makefile|20021030043213|15288|5bd1152661e7e933 [email protected][spaans]|scripts/kconfig/Makefile|20030807153305|27757
== fs/ntfs/super.c == BK|fs/ntfs/super.c|19700101030959|00024|ae6e00b03ea02889 [email protected][torvalds]|fs/ntfs/super.c|20030801220216|22158
D 1.135 03/08/07 16:48:50+02:00 [email protected][spaans] +1 -1
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 C
c Change all occurences of flavour to flavor
F 2654
K 22041
O -rw-rw-r--
P fs/ntfs/super.c
------------------------------------------------
D1286 1
I1286 1
* File system id. This is extremely *nix flavor dependent and even
== arch/i386/kernel/cpu/intel.c == [email protected]|arch/i386/kernel/cpu/intel.c|20020605182529|14299|83fae676fbe78e0d [email protected][torvalds]|arch/i386/kernel/cpu/intel.c|20030430143200|22519 D 1.20 03/08/07 16:48:50+02:00 [email protected][spaans] +1 -1
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 C
c Change all occurences of flavour to flavor
F 2654
K 22402
O -rw-rw-r--
P arch/i386/kernel/cpu/intel.c
------------------------------------------------
D366 1
I366 1
/* Intel PIII Tualatin. This comes in two flavors.
== include/net/sctp/constants.h == [email protected]|include/net/sctp/sctp_constants.h|20020819215340|26717|e2f7b309e21a66cf [email protected]|include/net/sctp/constants.h|20030804173539|51051
D 1.17 03/08/07 16:48:50+02:00 [email protected][spaans] +1 -1
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864
C
c Change all occurences of flavour to flavor
F 2655
K 50934
O -rw-rw-r--
P include/net/sctp/constants.h
------------------------------------------------
D82 1
I82 1
/* These are the different flavors of event. */
== net/sunrpc/svcauth_unix.c ==
[email protected][torvalds]|net/sunrpc/svcauth_unix.c|20021012023922|44522|e8927e109738a7a [email protected][torvalds]|net/sunrpc/svcauth_unix.c|20030627163755|50794
D 1.21 03/08/07 16:48:50+02:00 [email protected][spaans] +6 -6
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 C
c Change all occurences of flavour to flavor
F 2655
K 50092
O -rw-rw-r--
P net/sunrpc/svcauth_unix.c
------------------------------------------------
D46 1
I46 1
if (rv && rv->flavor != RPC_AUTH_UNIX) {
D57 1
I57 1
new->h.flavor = RPC_AUTH_UNIX;
D266 1
I266 1
if (dom->flavor != RPC_AUTH_UNIX)
D288 1
I288 1
if (dom->flavor != RPC_AUTH_UNIX)D403 1
I403 1
.flavor = RPC_AUTH_NULL,
D504 1
I504 1
.flavor = RPC_AUTH_UNIX,
== Documentation/s390/Debugging390.txt == [email protected]|Documentation/s390/Debugging390.txt|20020205181001|17682|38abccf5c3739022 [email protected][torvalds]|Documentation/s390/Debugging390.txt|20030312014752|03605 D 1.10 03/08/07 16:48:50+02:00 [email protected][spaans] +2 -2
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864
C
c Change all occurences of flavour to flavor
F 2654
K 3371
O -rw-rw-r--
P Documentation/s390/Debugging390.txt
------------------------------------------------
D1669 1
I1669 1
These come in two flavors, Format 0 ( 24 bit for backward ) D1744 1
I1744 1
The 390 IO systems come in 2 flavors the current 390 machines support both
== fs/sysv/super.c == [email protected]|fs/sysv/super.c|20020205190830|20794|d2909d10bd7c4d3f [email protected][torvalds]|fs/sysv/super.c|20030526022125|47529 D 1.22 03/08/07 16:48:50+02:00 [email protected][spaans] +8 -8
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 C
c Change all occurences of flavour to flavor
F 2655
K 46476
O -rw-rw-r--
P fs/sysv/super.c
------------------------------------------------
D267 1
I267 1
} flavors[] = {
D276 1
I276 1
static char *flavor_names[] = {
D285 1
I285 1
static void (*flavor_setup[])(struct sysv_sb_info *) = { D298 1
I298 1
char *found = flavor_names[sbi->s_type];
D305 1
I305 1
flavor_setup[sbi->s_type](sbi);
D374 1
I374 1
for (i = 0; i < sizeof(flavors)/sizeof(flavors[0]) && !size; i++) {
D376 1
I376 1
bh = sb_bread(sb, flavors[i].block);
D379 1
I379 1
size = flavors[i].test(SYSV_SB(sb), bh);== arch/mips/kernel/scall32-o32.S ==
[email protected][torvalds]|arch/mips/kernel/scall32-o32.S|20030801053947|63044|4cc5bba7d1ca75a8 [email protected][torvalds]|arch/mips/kernel/scall32-o32.S|20030801053948|30405
D 1.2 03/08/07 16:48:50+02:00 [email protected][spaans] +4 -4
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 C
c Change all occurences of flavour to flavor
F 2654
K 29937
O -rw-rw-r--
P arch/mips/kernel/scall32-o32.S
------------------------------------------------
D22 1
I22 1
/* Highest syscall used of any syscall flavor */
D341 1
I341 1
mille sys_ni_syscall 0 /* 0 - 999 SVR4 flavor */ D343 2 I344 2 mille sys_ni_syscall 0 /* 2000 - 2999 BSD43 flavor */ mille sys_ni_syscall 0 /* 3000 - 3999 POSIX flavor */
== arch/mips/mm-32/pg-r4k.S == [email protected][torvalds]|arch/mips/mm/pg-r4k.S|20030623190711|33260|7be7818a2c76f61 [email protected][torvalds]|arch/mips/mm-32/pg-r4k.S|20030801053948|65461 D 1.3 03/08/07 16:48:50+02:00 [email protected][spaans] +2 -2
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 C
c Change all occurences of flavour to flavor
F 2654
K 65227
O -rw-rw-r--
P arch/mips/mm-32/pg-r4k.S
------------------------------------------------
D31 1
I31 1
* have five flavors of the routine available for:
D115 1
I115 1
* This flavor of r4k_clear_page is for the R4600 V1.x. Cite from the
== arch/mips/mm-64/pg-r4k.c == [email protected][torvalds]|arch/mips64/mm/pg-r4k.c|20030623190834|25969|ecd0bdbaaedbdc21 [email protected][torvalds]|arch/mips/mm-64/pg-r4k.c|20030801053948|04120 D 1.3 03/08/07 16:48:50+02:00 [email protected][spaans] +2 -2
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 C
c Change all occurences of flavour to flavor
F 2654
K 54092
O -rw-rw-r--
P arch/mips/mm-64/pg-r4k.c
------------------------------------------------
D28 1
I28 1
* have five flavors of the routine available for:
D92 1
I92 1
* This flavor of r4k_clear_page is for the R4600 V1.x. Cite from the
== kernel/futex.c == [email protected]|kernel/futex.c|20020310195012|48961|39d169578d353bea [email protected]|kernel/futex.c|20030526033928|14606
D 1.29 03/08/07 16:48:50+02:00 [email protected][spaans] +1 -1
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 C
c Change all occurences of flavour to flavor
F 2655
K 14489
O -rw-rw-r--
P kernel/futex.c
------------------------------------------------
D13 1
I13 1
* "But they come in a choice of three flavors!"
== arch/sparc/math-emu/math.c == [email protected]|arch/sparc/math-emu/math.c|20020205174023|62816|aef85ee6f8e8a0ea [email protected][torvalds]|arch/sparc/math-emu/math.c|20030207161102|25393 D 1.3 03/08/07 16:48:50+02:00 [email protected][spaans] +1 -1
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 C
c Change all occurences of flavour to flavor
F 2654
K 25276
O -rw-rw-r--
P arch/sparc/math-emu/math.c
------------------------------------------------
D40 1
I40 1
* provide several possible flavors of multiply algorithm, most
== drivers/char/ftape/zftape/zftape-ctl.c == [email protected]|drivers/char/ftape/zftape/zftape-ctl.c|20020205174005|17560|7242a156fd497a05 [email protected][torvalds]|drivers/char/ftape/zftape/zftape-ctl.c|20030322021935|15717 D 1.9 03/08/07 16:48:50+02:00 [email protected][spaans] +1 -1
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864
C
c Change all occurences of flavour to flavor
F 2654
K 15600
O -rw-rw-r--
P drivers/char/ftape/zftape/zftape-ctl.c
------------------------------------------------
D128 1
I128 1
* well has various flavors of the
== drivers/isdn/eicon/adapter.h == [email protected]|drivers/isdn/eicon/adapter.h|20020205174012|37040|410433d89beedee5 [email protected][torvalds]|drivers/isdn/eicon/adapter.h|20030225035751|37028
D 1.6 03/08/07 16:48:50+02:00 [email protected][spaans] +1 -1
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 C
c Change all occurences of flavour to flavor
F 2654
K 36911
O -rw-rw-r--
P drivers/isdn/eicon/adapter.h
------------------------------------------------
D128 1
I128 1
byte DivasFlavorConfig[];
== drivers/net/7990.c == [email protected]|drivers/net/7990.c|20020205174002|33456|dcb0c81be07ac4be [email protected]|drivers/net/7990.c|20030428033618|12276
D 1.10 03/08/07 16:48:50+02:00 [email protected][spaans] +1 -1
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 C
c Change all occurences of flavour to flavor
F 2654
K 12159
O -rw-rw-r--
P drivers/net/7990.c
------------------------------------------------
D54 1
I54 1
/* debugging output macros, various flavors */
== drivers/net/ewrk3.c == [email protected]|drivers/net/ewrk3.c|20020205174001|13864|cfa24e3bd0cdc03c [email protected][torvalds]|drivers/net/ewrk3.c|20030525221423|27841
D 1.26 03/08/07 16:48:50+02:00 [email protected][spaans] +1 -1
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 C
c Change all occurences of flavour to flavor
F 2654
K 27724
O -rw-rw-r--
P drivers/net/ewrk3.c
------------------------------------------------
D39 1
I39 1
The shared memory mode comes in 3 flavors: 2kB, 32kB and 64kB. There is
== fs/nfs/inode.c == [email protected]|fs/nfs/inode.c|20020205173938|09363|3f03927acfdbd4a [email protected][torvalds]|fs/nfs/inode.c|20030717191036|63907
D 1.85 03/08/07 16:48:50+02:00 [email protected][spaans] +8 -8
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 C
c Change all occurences of flavour to flavor
F 2654
K 62737
O -rw-rw-r--
P fs/nfs/inode.c
------------------------------------------------
D1357 1
I1357 1
rpc_authflavor_t authflavor;
D1410 5
I1414 5
authflavor = RPC_AUTH_UNIX;
if (data->auth_flavorlen != 0) {
if (data->auth_flavorlen > 1)
printk(KERN_INFO "NFS: cannot yet deal with multiple auth flavors.\n");
if (copy_from_user(&authflavor, data->auth_flavors, sizeof(authflavor))) {
D1420 1
I1420 1
server->rpc_ops->version, authflavor);
D1444 1
I1444 1
err = nfs_sb_init(sb, authflavor);== fs/partitions/check.h == [email protected]|fs/partitions/check.h|20020205173939|07282|8bf4113a8485c596 [email protected][torvalds]|fs/partitions/check.h|20030430143235|62344
D 1.11 03/08/07 16:48:50+02:00 [email protected][spaans] +1 -1
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 C
c Change all occurences of flavour to flavor
F 2654
K 62227
O -rw-rw-r--
P fs/partitions/check.h
------------------------------------------------
D35 1
I35 1
int origin, char *flavor, int max_partitions);
== fs/partitions/msdos.c == [email protected]|fs/partitions/msdos.c|20020205173939|08398|638b6058a3f829f7 [email protected][torvalds]|fs/partitions/msdos.c|20030527004843|11427 D 1.21 03/08/07 16:48:50+02:00 [email protected][spaans] +2 -2
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 C
c Change all occurences of flavour to flavor
F 2654
K 11193
O -rw-rw-r--
P fs/partitions/msdos.c
------------------------------------------------
D212 1
I212 1
u32 offset, u32 size, int origin, char *flavor,
D226 1
I226 1
printk(" %s%d: <%s:", state->name, origin, flavor);== include/asm-i386/types.h == [email protected]|include/asm-i386/types.h|20020205173944|26206|8bddf1df4b96d31c [email protected][torvalds]|include/asm-i386/types.h|20030519172735|38762
D 1.6 03/08/07 16:48:50+02:00 [email protected][spaans] +1 -1
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 C
c Change all occurences of flavour to flavor
F 2655
K 38645
O -rw-rw-r--
P include/asm-i386/types.h
------------------------------------------------
D52 1
I52 1
/* DMA addresses come in generic and 64-bit flavors. */
== include/asm-mips/fcntl.h ==
[email protected]|include/asm-mips/fcntl.h|20020205173945|13899|997d88dc30026e54 [email protected][torvalds]|include/asm-mips/fcntl.h|20030801053950|61677
D 1.5 03/08/07 16:48:50+02:00 [email protected][spaans] +1 -1
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 C
c Change all occurences of flavour to flavor
F 2655
K 61560
O -rw-rw-r--
P include/asm-mips/fcntl.h
------------------------------------------------
D80 1
I80 1
* The flavors of struct flock. "struct flock" is the ABI compliant
== include/asm-mips/unistd.h ==
[email protected]|include/asm-mips/unistd.h|20020205173944|32413|96869979d8709174 [email protected][torvalds]|include/asm-mips/unistd.h|20030801053950|22696
D 1.9 03/08/07 16:48:50+02:00 [email protected][spaans] +3 -3
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 C
c Change all occurences of flavour to flavor
F 2655
K 22345
O -rw-rw-r--
P include/asm-mips/unistd.h
------------------------------------------------
D293 1
I293 1
* Offset of the last Linux o32 flavored syscall
D537 1
I537 1
* Offset of the last Linux flavored syscall
D785 1
I785 1
* Offset of the last N32 flavored syscall
== include/asm-sparc64/types.h == [email protected]|include/asm-sparc64/types.h|20020205173950|51322|8cba6ad8b65b9893 [email protected]|include/asm-sparc64/types.h|20021231041421|49005
D 1.4 03/08/07 16:48:50+02:00 [email protected][spaans] +1 -1
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 C
c Change all occurences of flavour to flavor
F 2655
K 48888
O -rw-rw-r--
P include/asm-sparc64/types.h
------------------------------------------------
D54 1
I54 1
/* Dma addresses come in generic and 64-bit flavors. */
== include/linux/dio.h == [email protected]|include/linux/dio.h|20020205173942|53841|5d000b7be555bc76 [email protected]|include/linux/dio.h|20020724032151|40412
D 1.3 03/08/07 16:48:50+02:00 [email protected][spaans] +1 -1
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 C
c Change all occurences of flavour to flavor
F 2655
K 40295
O -rw-rw-r--
P include/linux/dio.h
------------------------------------------------
D127 1
I127 1
#define DIO_ID_FBUFFER 0x39 /* framebuffer: flavor is distinguished by secondary ID */
== include/linux/sunrpc/svc.h == [email protected]|include/linux/sunrpc/svc.h|20020205173941|15025|8e29f1e46c1fd990 [email protected][torvalds]|include/linux/sunrpc/svc.h|20030624191536|31984 D 1.25 03/08/07 16:48:50+02:00 [email protected][spaans] +1 -1
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 C
c Change all occurences of flavour to flavor
F 2655
K 31867
O -rw-rw-r--
P include/linux/sunrpc/svc.h
------------------------------------------------
D111 1
I111 1
struct auth_ops * rq_authop; /* authentication flavor */
== include/linux/sunrpc/svcauth.h == [email protected]|include/linux/sunrpc/svcauth.h|20020205173941|15745|13d0f21c8c263fde [email protected][torvalds]|include/linux/sunrpc/svcauth.h|20030111044021|16719 D 1.10 03/08/07 16:48:50+02:00 [email protected][spaans] +5 -5
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864
C
c Change all occurences of flavour to flavor
F 2655
K 15900
O -rw-rw-r--
P include/linux/sunrpc/svcauth.h
------------------------------------------------
D38 1
I38 1
* A domain is created by an authentication flavor module based on name
D47 1
I47 1
int flavor;
D51 1
I51 1
* Each authentication flavor registers an auth_ops
D54 1
I54 1
* flavor gives the auth flavor. It determines where the flavor is registered
D85 1
I85 1
int flavor;
== net/decnet/dn_fib.c == [email protected]|net/decnet/dn_fib.c|20020205173959|01501|b27680a712405bb8 [email protected]|net/decnet/dn_fib.c|20030507203649|44616
D 1.7 03/08/07 16:48:50+02:00 [email protected][spaans] +4 -4
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 C
c Change all occurences of flavour to flavor
F 2655
K 44148
O -rw-rw-r--
P net/decnet/dn_fib.c
------------------------------------------------
D305 3
I307 3
unsigned flavor = attr->rta_type;
if (flavor) {
if (flavor > RTAX_MAX)
D309 1
I309 1
fi->fib_metrics[flavor-1] = *(unsigned*)RTA_DATA(attr);== net/ipv6/exthdrs.c == [email protected]|net/ipv6/exthdrs.c|20020205173959|13760|16ff28906231f4a1 [email protected]|net/ipv6/exthdrs.c|20030624083331|27832
D 1.14 03/08/07 16:48:50+02:00 [email protected][spaans] +1 -1
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 C
c Change all occurences of flavour to flavor
F 2655
K 27715
O -rw-rw-r--
P net/ipv6/exthdrs.c
------------------------------------------------
D696 1
I696 1
* seeing an unknown discard-with-error flavor TLV option if it's a
== net/sunrpc/svcauth.c == [email protected]|net/sunrpc/svcauth.c|20020205173959|06895|dd2942bf6d6fcda [email protected][torvalds]|net/sunrpc/svcauth.c|20030624191435|27121 D 1.13 03/08/07 16:48:50+02:00 [email protected][spaans] +3 -3
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 C
c Change all occurences of flavour to flavor
F 2655
K 26770
O -rw-rw-r--
P net/sunrpc/svcauth.c
------------------------------------------------
D91 1
I91 1
* Entries are only added by flavors which will normally
D103 1
I103 1
* each auth flavor has it's own type.
D121 1
I121 1
authtab[dom->flavor]->domain_release(dom);
== include/linux/nfs4_mount.h ==
[email protected][torvalds]|include/linux/nfs4_mount.h|20021016023045|64519|cbcac9fb1bf3e26d [email protected][torvalds]|include/linux/nfs4_mount.h|20021016023046|09260
D 1.2 03/08/07 16:48:50+02:00 [email protected][spaans] +3 -3
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 C
c Change all occurences of flavour to flavor
F 2655
K 8909
O -rw-rw-r--
P include/linux/nfs4_mount.h
------------------------------------------------
D53 3
I55 3
/* Pseudo-flavors to use for authentication. See RFC2623 */ int auth_flavorlen; /* 1 */ int *auth_flavors; /* 1 */
== scripts/kconfig/Makefile ==
[email protected][torvalds]|scripts/kconfig/Makefile|20021030043213|15288|5bd1152661e7e933 [email protected][torvalds]|scripts/kconfig/Makefile|20030316011735|27874
D 1.7 03/08/07 16:48:50+02:00 [email protected][spaans] +1 -1
B [email protected]|ChangeSet|20020205173056|16047|c1d11a41ed024864 C
c Change all occurences of flavour to flavor
F 2655
K 27757
O -rw-rw-r--
P scripts/kconfig/Makefile
------------------------------------------------
D14 1
I14 1
# object files used by all lkc flavors
# Patch checksum=21f4a75e
VrGr,
Signature · 4 lines
Jasper Spaans http://jsp.vs19.net/contact/ <== ``Got no clue? Too bad for you'' ==> <== ==>
Quoted 3 lines · Jasper Spaans
It changes all occurrences of 'flavour' to 'flavor' in the complete tree; I've just comiled all affected files (that is, the config resulting from make allyesconfig minus already broken stuff) succesfully on i386.
The Linux kernel tended to favour european spelling, and favOUr is indeed correct English.
--Alan Cox <[email protected]> wrote (on Thursday, August 07, 2003 23:37:23 +0100):
Quoted 7 lines · Jasper Spaans
Quoted 3 lines
It changes all occurrences of 'flavour' to 'flavor' in the complete tree; I've just comiled all affected files (that is, the config resulting from make allyesconfig minus already broken stuff) succesfully on i386.
The Linux kernel tended to favour european spelling, and favOUr is indeed correct English.
Either way, haven't we stopped piddling around with spelling fixes and breaking everyone's patches yet? I thought we had ...
M.
Quoted 7 lines · Martin J. Bligh
--Alan Cox <[email protected]> wrote (on Thursday, August 07, 2003 23:37:23 +0100):
Quoted 5 lines · Jasper Spaans
Quoted 3 lines
It changes all occurrences of 'flavour' to 'flavor' in the complete tree; I've just comiled all affected files (that is, the config resulting from make allyesconfig minus already broken stuff) succesfully on i386.
Quoted 7 lines
Quoted 2 lines
The Linux kernel tended to favour european spelling, and favOUr is indeed correct English.
Either way, haven't we stopped piddling around with spelling fixes and breaking everyone's patches yet? I thought we had ...
M.
Well, I for one have stopped with the spelling patches since the cost/benefit ratio was too high for many key folks. When the spelling patches were being generated, we were quite careful not to "fix" English spellings.
I won't begin the next round of spelling fixes until 2.7.40, for those who want to plan ahead that far. And next time, I'll send the patches through the maintainers. But we can still argue about spelling fixes if that makes people happier.
Cheers,
Steven (off-duty spelling cop)
Re: [PATCH] Change all occurrences of 'flavour' to 'flavor', [email protected]
In reply to Alan CoxQuoted 6 lines · Alan Cox
Quoted 3 lines
It changes all occurrences of 'flavour' to 'flavor' in the complete tree; I've just comiled all affected files (that is, the config resulting from make allyesconfig minus already broken stuff) succesfully on i386.
The Linux kernel tended to favour european spelling, and favOUr is indeed correct English.
Personally, I prefer the european flavour too.
However, a quick count on the original tree shows:
spaans@spaans:~/bk/export$ grep -ir 'flavour' . |wc -l
74
spaans@spaans:~/bk/export$ grep -ir 'flavor' . |wc -l
192which is why I chose to do it this way.
There's no reason to not do it the other way around, of course.
VrGr,
Signature · 1 line
Jasper Spaans http://jsp.vs19.net/contact/
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 2 lines · J.C. Wren
Can we make this a menuconfig option? :) ALTERNATE_FLAVOR_SPELLING=y. As you type 'make', it'll just preprocess all the source files.
Uhm, and what about the spelling of that option? ;)
(And no, I did not mark this subthread [OT] by accident)
VrGr,
Signature · 1 line
Jasper Spaans http://jsp.vs19.net/contact/
Quoted 7 lines · Alan Cox
Quoted 3 lines · Jasper Spaans
It changes all occurrences of 'flavour' to 'flavor' in the complete tree; I've just comiled all affected files (that is, the config resulting from make allyesconfig minus already broken stuff) succesfully on i386.
The Linux kernel tended to favour european spelling, and favOUr is indeed correct English.
Eh? Maybe you did (obviously), but I don't see a general trend there. I tend to prefer favor/color etc. Oh, and disk obviously.
Signature · 1 line
Jens Axboe
Quoted 10 lines · Jasper Spaans
Hello,
This patch is a followup to changeset 1.1046.1.459,
It changes all occurrences of 'flavour' to 'flavor' in the complete tree; I've just comiled all affected files (that is, the config resulting from make allyesconfig minus already broken stuff) succesfully on i386.
Arrrgh! You can't be serious!
Quoted 5 lines · Zwane Mwaikambo
Quoted 3 lines
It changes all occurrences of 'flavour' to 'flavor' in the complete tree; I've just comiled all affected files (that is, the config resulting from make allyesconfig minus already broken stuff) succesfully on i386.
Arrrgh! You can't be serious!
Yes, I am bloody serious; this patch might look purely cosmetic at first sight.. yet, there's a technical reason for at least one part of it. Grep and see the horror:
$ egrep -ni 'flavou?r' fs/nfs/inode.c [snip] 1357: rpc_authflavor_t authflavour; [snip]
VrGr,
Signature · 1 line
Jasper Spaans http://jsp.vs19.net/contact/
Quoted 17 lines · Jasper Spaans
Quoted 8 lines · Zwane Mwaikambo
Quoted 5 lines
It changes all occurrences of 'flavour' to 'flavor' in the complete tree; I've just comiled all affected files (that is, the config resulting from make allyesconfig minus already broken stuff) succesfully on i386.
Arrrgh! You can't be serious!
Yes, I am bloody serious; this patch might look purely cosmetic at first sight.. yet, there's a technical reason for at least one part of it. Grep and see the horror:
Quoted 7 lines
$ egrep -ni 'flavou?r' fs/nfs/inode.c [snip] 1357: rpc_authflavor_t authflavour; [snip]VrGr,
I think another important issue is consistency. We should choose a style, and then stick with it.
Quoted 3 lines · Alexander Winston
Quoted 1 line
Quoted 1 line
Quoted 1 line
It changes all occurrences of 'flavour' to 'flavor' in the complete tree;
I think another important issue is consistency. We should choose a style, and then stick with it.
Agree; that's why this patch is for the complete tree.
VrGr,
Signature · 1 line
Jasper Spaans http://jsp.vs19.net/contact/
Quoted 8 lines · Jasper Spaans
Quoted 5 lines · Zwane Mwaikambo
Quoted 3 lines
It changes all occurrences of 'flavour' to 'flavor' in the complete tree; I've just comiled all affected files (that is, the config resulting from make allyesconfig minus already broken stuff) succesfully on i386.
Arrrgh! You can't be serious!
Quoted 8 lines
Yes, I am bloody serious; this patch might look purely cosmetic at first sight.. yet, there's a technical reason for at least one part of it. Grep and see the horror:
$ egrep -ni 'flavou?r' fs/nfs/inode.c [snip] 1357: rpc_authflavor_t authflavour; [snip]
I know it wasn't purely cosmetic but i just wish we could use the proper spelling instead of US English. No i'm not trolling.
Signature · 1 line
function.linuxpower.ca
Quoted 2 lines · Zwane Mwaikambo
I know it wasn't purely cosmetic but i just wish we could use the proper spelling instead of US English. No i'm not trolling.
You might want to be, but you are ;)
US English is clearly more optimized.
Signature · 1 line
Jens Axboe
Quoted 7 lines · Jens Axboe
Quoted 2 lines · Zwane Mwaikambo
I know it wasn't purely cosmetic but i just wish we could use the proper spelling instead of US English. No i'm not trolling.
You might want to be, but you are ;)
US English is clearly more optimized.
E.g. you need less than 1/1000 of the money you need for one billion (UK English) English pounds for one billion (US English) dollars.
OTOH, it sounds funny that the USA are indebted with several trillion (US English) dollars.
Quoted 1 line
Jens Axboe
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
fredag 8. august 2003, 13:04, skrev Adrian Bunk:
Quoted 7 lines · Jens Axboe
Quoted 6 lines · Zwane Mwaikambo
Quoted 2 lines
I know it wasn't purely cosmetic but i just wish we could use the proper spelling instead of US English. No i'm not trolling.
You might want to be, but you are ;)
Quoted 7 lines
Quoted 1 line
US English is clearly more optimized.
E.g. you need less than 1/1000 of the money you need for one billion (UK English) English pounds for one billion (US English) dollars.
OTOH, it sounds funny that the USA are indebted with several trillion (US English) dollars.
How so?
In Norwegian you'd be right; we have "Million - Milliard - Billion - Billiard" and so forth.
But UK English? How does that work?
I'm having difficulties imagining you saying "one milliard pounds".
- - Svein Ove Aas
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (GNU/Linux)
iD8DBQE/M9a+9OlFkai3rMARAtCSAJ9W7VU3QAgu7gRaJGzq7tJujDsqswCdHsDX 6Fpxi808OjdFCW18MQ+L4K8=
=buHC
-----END PGP SIGNATURE-----
Quoted 7 lines · Svein Ove Aas
fredag 8. august 2003, 13:04, skrev Adrian Bunk:
Quoted 5 lines
E.g. you need less than 1/1000 of the money you need for one billion (UK English) English pounds for one billion (US English) dollars.
OTOH, it sounds funny that the USA are indebted with several trillion (US English) dollars.
Quoted 7 lines
How so?
In Norwegian you'd be right; we have "Million - Milliard - Billion - Billiard" and so forth.
But UK English? How does that work?
I'm having difficulties imagining you saying "one milliard pounds".
One British billion is one million million. An American billion is one thousand million. The American billion seems to be more widely used than the British one these days, even in Britain. Of course there is the exchange rate to take account of too.
Signature · 1 line
Ian.
Quoted 3 lines · Zwane Mwaikambo
Quoted 1 line
Quoted 1 line
Quoted 1 line
It changes all occurrences of 'flavour' to 'flavor' in the complete tree;
I know it wasn't purely cosmetic but i just wish we could use the proper spelling instead of US English. No i'm not trolling.
I totally agree with you on that and I do have the diff doing lying around here. Good fuel for a flamefest. I guess our benevolent dictator needs to decide on this issue :)
VrGr,
Signature · 1 line
Jasper Spaans http://jsp.vs19.net/contact/
Quoted 8 lines · Jasper Spaans
Quoted 3 lines · Zwane Mwaikambo
Quoted 1 line
Quoted 1 line
Quoted 1 line
It changes all occurrences of 'flavour' to 'flavor' in the complete tree;
I know it wasn't purely cosmetic but i just wish we could use the proper spelling instead of US English. No i'm not trolling.
I totally agree with you on that and I do have the diff doing lying around here. Good fuel for a flamefest. I guess our benevolent dictator needs to decide on this issue :)
_Who cares_? People going nuts with spelling changes was bad (and disruptive) enough, being overly pedantic with us vs uk spelling is an even bigger waste of time imho. It's not like people don't understand what is there. And it's not like it adds any extra value to the kernel.
Signature · 1 line
Jens Axboe
Quoted 2 lines · Jens Axboe
_Whocares_? People going nuts with spelling changes was bad (and disruptive) enough,
Obviously, you don't. What happened to good old Gründlichkeit? ;)
Quoted 2 lines
being overly pedantic with us vs uk spelling is an even bigger waste of time imho.
Yep.
Quoted 2 lines
It's not like people don't understand
what is there. And it's not like it adds any extra value to the kernel.
This holds for about 90% of that patch (with which I mean to the use of flavou?r/ in non-code); the 10% where it does matter (and thus adds value) is what I'm trying to get some consensus on.
VrGr,
Signature · 1 line
Jasper Spaans http://jsp.vs19.net/contact/
Quoted 5 lines · Jasper Spaans
Quoted 2 lines · Jens Axboe
_Whocares_? People going nuts with spelling changes was bad (and disruptive) enough,Obviously, you don't. What happened to good old Gründlichkeit? ;)
I don't know, I'm not german.
Quoted 5 lines
Quoted 2 lines
being overly pedantic with us vs uk spelling is an even bigger waste of time imho.
Yep.
Quoted 7 lines
Quoted 3 lines
It's not like people don't understand
what is there. And it's not like it adds any extra value to the kernel.This holds for about 90% of that patch (with which I mean to the use of flavou?r/ in non-code); the 10% where it does matter (and thus adds value) is what I'm trying to get some consensus on.
My comments _were_ for printed messages, for comments it's 101% superflous.
Signature · 1 line
Jens Axboe
Quoted 8 lines · Jasper Spaans
Quoted 3 lines · Zwane Mwaikambo
Quoted 1 line
Quoted 1 line
Quoted 1 line
It changes all occurrences of 'flavour' to 'flavor' in the complete tree;
I know it wasn't purely cosmetic but i just wish we could use the proper spelling instead of US English. No i'm not trolling.
I totally agree with you on that and I do have the diff doing lying around here. Good fuel for a flamefest. I guess our benevolent dictator needs to decide on this issue :)
Apparently he decided a while ago. bah, i hope this doesn't mean a barrage of US spelling patches.
Signature · 1 line
function.linuxpower.ca
Quoted 3 lines
rpc_authflavor_tauthflavour;
did anybody say melting pot? :)
Quoted 10 lines · Jasper Spaans
Quoted 5 lines · Zwane Mwaikambo
Quoted 3 lines
It changes all occurrences of 'flavour' to 'flavor' in the complete tree; I've just comiled all affected files (that is, the config resulting from make allyesconfig minus already broken stuff) succesfully on i386.
Arrrgh! You can't be serious!
Quoted 8 lines
Yes, I am bloody serious; this patch might look purely cosmetic at first sight.. yet, there's a technical reason for at least one part of it. Grep and see the horror:
$ egrep -ni 'flavou?r' fs/nfs/inode.c [snip] 1357: rpc_authflavor_t authflavour; [snip]
Ah, for a moment, I was worried that someone was talking about text in comments.
Yes, when it comes to spelling of words in variable and type names, I think it would be a good idea to be consistent.
What is Linus's preferred spelling? Let's use that.
Quoted 23 lines · Timothy Miller
Quoted 10 lines · Jasper Spaans
Quoted 5 lines · Zwane Mwaikambo
Quoted 3 lines
It changes all occurrences of 'flavour' to 'flavor' in the complete tree; I've just comiled all affected files (that is, the config resulting from make allyesconfig minus already broken stuff) succesfully on i386.
Arrrgh! You can't be serious!
Quoted 8 lines
Yes, I am bloody serious; this patch might look purely cosmetic at first sight.. yet, there's a technical reason for at least one part of it. Grep and see the horror:
$ egrep -ni 'flavou?r' fs/nfs/inode.c [snip] 1357: rpc_authflavor_t authflavour; [snip]
Quoted 8 lines
Ah, for a moment, I was worried that someone was talking about text in comments.
Yes, when it comes to spelling of words in variable and type names, I think it would be a good idea to be consistent.
What is Linus's preferred spelling? Let's use that.
It's a little past April Fool's day. What are you guys smoking? Next, you'll want to change all the 'i's to 'y's and add 'ing'.
Certainly one might want to change:
int TheVariableThatWillBeUsedAsACounter;
to..
int i;
However, changing the spelling of a variable name is absurd no matter how you look at it.
Cheers,
Dick Johnson
Penguin : Linux version 2.4.20 on an i686 machine (797.90 BogoMips).
Note 96.31% of all statistics are fiction.
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 8 lines
Quoted 6 lines
It changes all occurrences of 'flavour' to 'flavor' in the complete tree; I've just comiled all affected files (that is, the config resulting from make allyesconfig minus already broken stuff) succesfully on i386.
Arrrgh! You can't be serious!
Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
Yes, I am bloody serious; this patch might look purely cosmetic at first sight.. yet, there's a technical reason for at least one part of it. Grep and see the horror:
$ egrep -ni 'flavou?r' fs/nfs/inode.c [snip] 1357: rpc_authflavor_t authflavour; [snip]
Anybody who screws with that spelling is setting himself up for the red hot poker treatment...
The flavor/flavour thing reflects the fact that the code has been written and modified by different people with different backgrounds. Some people have been unfortunate enough to be of the US persuasion, others have grown up with the British spelling.
Now leave it alone and go do something useful with your lives...
Trond
Quoted 11 lines · Trond Myklebust
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 6 lines
Quoted 4 lines
It changes all occurrences of 'flavour' to 'flavor' in the complete tree; I've just comiled all affected files (that is, the config resulting from make allyesconfig minus already broken stuff) succesfully on i386.
Arrrgh! You can't be serious!
Yes, I am bloody serious; this patch might look purely cosmetic at first sight.. yet, there's a technical reason for at least one part of it. Grep and see the horror:
Quoted 5 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
$ egrep -ni 'flavou?r' fs/nfs/inode.c [snip] 1357: rpc_authflavor_t authflavour; [snip]Anybody who screws with that spelling is setting himself up for the red hot poker treatment...
That and toothpicks under the fingernails comes to mind.
Quoted 8 lines
The flavor/flavour thing reflects the fact that the code has been written and modified by different people with different backgrounds. Some people have been unfortunate enough to be of the US persuasion, others have grown up with the British spelling.
Now leave it alone and go do something useful with your lives...
Trond
What about the scenario where both spellings are used in a header someplace that winds up being a systemwide reference? I don't know that it has been, but such a 'correction' has the potential to take us back to square one and 1993. I have had recurring daytime nightmares of such possibilities since this subject came up the first time a week or so ago.
Methinks the proponent here should find another, more productive outlet for his frustrations. This particular dog won't hunt.
Signature · 7 lines
Cheers, Gene AMD K6-III@500mhz 320M Athlon1600XP@1400mhz 512M 99.27% setiathome rank, not too shabby for a WV hillbilly Yahoo.com attornies please note, additions to this message by Gene Heskett are: Copyright 2003 by Maurice Eugene Heskett, all rights reserved.
Quoted 6 lines
What about the scenario where both spellings are used in a header someplace that winds up being a systemwide reference? I don't know that it has been, but such a 'correction' has the potential to take us back to square one and 1993. I have had recurring daytime nightmares of such possibilities since this subject came up the first time a week or so ago.
Wow. My FUD-o-meter just went berserk.
VrGr,
Signature · 4 lines
Jasper Spaans http://jsp.vs19.net/contact/ <== The only intuitive interface ever created was a ==> <== nipple. ==>
Quoted 8 lines · Jasper Spaans
Quoted 6 lines
What about the scenario where both spellings are used in a header someplace that winds up being a systemwide reference? I don't know that it has been, but such a 'correction' has the potential to take us back to square one and 1993. I have had recurring daytime nightmares of such possibilities since this subject came up the first time a week or so ago.
Wow. My FUD-o-meter just went berserk.
Well we expose both Color and Colour in various application level interfaces. As far as I am concerned English<->English changes are just noise. Fixing real typos can be a big help especially to non first language speakers who are wondering just wtf that word is..
Quoted 8 lines · Alan Cox
Quoted 7 lines · Jasper Spaans
Quoted 6 lines
What about the scenario where both spellings are used in a header someplace that winds up being a systemwide reference? I don't know that it has been, but such a 'correction' has the potential to take us back to square one and 1993. I have had recurring daytime nightmares of such possibilities since this subject came up the first time a week or so ago.
Quoted 6 lines
Quoted 1 line
Wow. My FUD-o-meter just went berserk.
Well we expose both Color and Colour in various application level interfaces. As far as I am concerned English<->English changes are just noise. Fixing real typos can be a big help especially to non first language speakers who are wondering just wtf that word is..
As I relied to Jasper privately, the chances are slim but not non-existant. However I also commented that a spell checker able to note that there is only one or two characters difference in the words being compared, or only the order had been changed, would be a huge help in running down typo's.
Signature · 7 lines
Cheers, Gene AMD K6-III@500mhz 320M Athlon1600XP@1400mhz 512M 99.27% setiathome rank, not too shabby for a WV hillbilly Yahoo.com attornies please note, additions to this message by Gene Heskett are: Copyright 2003 by Maurice Eugene Heskett, all rights reserved.
Quoted 5 lines
Quoted 2 lines
Quoted 2 lines
$ egrep -ni 'flavou?r' fs/nfs/inode.c 1357: rpc_authflavor_t authflavour;However, changing the spelling of a variable name is absurd no matter how you look at it.
Read that line of code again please. Next, imagine writing code in there.
VrGr,
Signature · 4 lines
Jasper Spaans http://jsp.vs19.net/contact/ <== The only intuitive interface ever created was a ==> <== nipple. ==>
Quoted 9 lines · Jasper Spaans
Quoted 5 lines
Quoted 2 lines
Quoted 2 lines
$ egrep -ni 'flavou?r' fs/nfs/inode.c 1357: rpc_authflavor_t authflavour;However, changing the spelling of a variable name is absurd no matter how you look at it.
Read that line of code again please. Next, imagine writing code in there.
VrGr,
Yes. It's wonderful. Pure poetry to me! It's probably in line for the Pulitzer prize for literature. I like it.
That said, there probably is a good reason why not to define a special type for that variable. But, then again, that's not a spelling matter.
Cheers,
Dick Johnson
Penguin : Linux version 2.4.20 on an i686 machine (797.90 BogoMips).
Note 96.31% of all statistics are fiction.
Quoted 2 lines · Timothy Miller
Quoted 2 lines
1357:
rpc_authflavor_tauthflavour;
This one I think is valid. Considering how many people seem to care, I think we should keep it as the only valid case for now.
Quoted 4 lines
Yes, when it comes to spelling of words in variable and type names, I think it would be a good idea to be consistent.
What is Linus's preferred spelling? Let's use that.
I don't much care. I was taught English spelling in school, and I've gotten used to US spelling here.
I think you guys who care should have a huge free-for-all, an electronic mud-wrestling thing if you will. But not on linux-kernel.
I can see it now:
".. Alan Cox gets up, and tackles Zwane, who goes down in the mud.
Oops. They were on the same side. I guess Alan got caught up in the rush. Jasper tries to take advantage of the situation, but slips in the mud, and goes down in a heap with Alexander..."
Tell me when it's over.
Linus
Quoted 3 lines · Linus Torvalds
Quoted 1 line
Quoted 1 line
1357:
rpc_authflavor_tauthflavour;This one I think is valid. Considering how many people seem to care, I think we should keep it as the only valid case for now.
Right. I'll whip up a patch that is somewhat more subtle... minimizing the damage done to other files.
Quoted 3 lines
I think you guys who care should have a huge free-for-all, an electronic mud-wrestling thing if you will. But not on linux-kernel.
...
:D
VrGr,
Signature · 1 line
Jasper Spaans http://jsp.vs19.net/contact/
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
" " == Linus Torvalds <[email protected]> writes:
> On Fri, 8 Aug 2003, Timothy Miller wrote:
>>
>> > 1357: rpc_authflavor_t authflavour;
> This one I think is valid. Considering how many people seem to > care, I think we should keep it as the only valid case for now.
Since we appear to be in the silly season...
fs/nfs/inode.c +1 -1
@@ -1354,7 +1354,7 @@struct rpc_xprt *xprt =NULL ;struct rpc_clnt *clnt =NULL ;struct rpc_timeout timeparms; -rpc_authflavor_t authflavour; +rpc_authflavour_t authflavour;int proto, err = -EIO ; sb->s_blocksize_bits =0 ;
include/linux/sunrpc/auth.h +2 -0
@@ -138,5 +138,7 @@return cred; } +#define rpc_authflavour_t rpc_authflavor_t +#endif /* __KERNEL__ */ #endif /* _LINUX_SUNRPC_AUTH_H */
Quoted 2 lines · Trond Myklebust
Since we appear to be in the silly season...
No, your patch isn't silly, it's EVIL. It fundamentally breaks the notion of "grep for usage" by introducing two names to the same thing, without having even a good reason (ie no "nice abstraction" thing or anything).
So that's just bad.
In contrast, switching "authflavour" to "authflavor" (to match the type) ahs the advantage of _improving_ greppability.
Linus
Quoted 5 lines · Linus Torvalds
Quoted 1 line
Since we appear to be in the silly season...
So that's just bad.
In contrast, switching "authflavour" to "authflavor" (to match the type) ahs the advantage of _improving_ greppability.
As I stated before, I'll whip up a patch. However, it's 2:45 localtime here right now, and I need to catch some sleep.
VrGr,
Signature · 1 line
Jasper Spaans http://jsp.vs19.net/contact/
PATCH 1/1 Fix up fs/nfs/inode.c wrt flavo[u]r
Quoted 2 lines · Jasper Spaans
As I stated before, I'll whip up a patch. However, it's 2:45 localtime here right now, and I need to catch some sleep.
Here goes; this is the least intrusive version I could make which still makes sense.
fs/nfs/inode.c | 16 ++++++++-------- include/linux/nfs4_mount.h | 4 ++-- include/linux/nfs_mount.h | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-)
For those who want to look at this without using bitkeeper, a plaintext patch is available at
http://jsp.vs19.net/tmp/flavour.txt
This BitKeeper patch contains the following changesets:
1.1150
## Wrapped with uu ##
M(R!5<V5R.@EJ87-P97(*(R!(;W-T.@EV<S$Y+FYE= HC(%)O;W0Z"2]H;VUE M+W-P86%N<R]B:R]L:6YU>"TR+C8*"B,@4&%T8V@@=F5R<SH),2XS"B,@4&%T M8V@@='EP93H)4D5'54Q!4@H*/3T@0VAA;F=E4V5T(#T]"G1O<G9A;&1S0&%T M:&QO;BYT<F%N<VUE=&$N8V]M?$-H86YG95-E='PR,# R,#(P-3$W,S U-GPQ M-C T-WQC,60Q,6$T,65D,#(T.#8T"G1M;VQI;F% 8V%B;&5S<&5E9"YC;VU\
M0VAA;F=E4V5T?#(P,#,P.# Y,38T,#$W?#,R.#8V"D0@,2XQ,34P(# S+S X M+S Y(#(Q.C,W.C(P*S R.C P(&IA<W!E<D!V<S$Y+FYE=" K-" M, I"('1O M<G9A;&1S0&%T:&QO;BYT<F%N<VUE=&$N8V]M?$-H86YG95-E='PR,# R,#(P M-3$W,S U-GPQ-C T-WQC,60Q,6$T,65D,#(T.#8T"D,*8R!#:&%N9V4@<W!E M;&QI;F<@;V8@9FQA=F]U<B!T;R!F;&%V;W(@:6X@9G,O;F9S+VEN;V1E+F,@ M86YD('1H92!H96%D97)S('1H:7,@9FEL92!I;F-L=61E<PIC( IC(%1H:7,@ M<')E=F5N=',@86YY(&-O;F9U<VEO;B!T:&%T(&UI9VAT(&%R:7-E(&)E8V%U M<V4@8F]T:"!S<&5L;&EN9W,@87)E('5S960@:6X@=&AE('-A;64@<V]U<F-E M(&9I;&4N"DL@,C<Q.34*4"!#:&%N9V53970*+2TM+2TM+2TM+2TM+2TM+2TM M+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM"@HP83 */B!T;W)V86QD M<T!A=&AL;VXN=')A;G-M971A+F-O;7Q":71+965P97(O971C+VEG;F]R97PR M,# R,#(P-3$W,S U-GPQ-S<U,7QF83<Q8S5E9#,P,&$S8V9C(&IA<W!E<D!V M<S$Y+FYE='Q":71+965P97(O971C+VEG;F]R97PR,# S,#@P.3$Y,S8P,7PV M,S U-0H^('1O<G9A;&1S0&%T:&QO;BYT<F%N<VUE=&$N8V]M?&EN8VQU9&4O M;&EN=7@O;F9S7VUO=6YT+FA\,C P,C R,#4Q-S,Y-#!\,C8V,C!\-SED,3<Q M-#1A,C=C-#%E92!J87-P97) =G,Q.2YN971\:6YC;'5D92]L:6YU>"]N9G-? M;6]U;G0N:'PR,# S,#@P.3$Y,S8P,7PV-#,S-PH^('1R;VYD+FUY:VQE8G5S M=$!F>7,N=6EO+FYO6W1O<G9A;&1S77QI;F-L=61E+VQI;G5X+VYF<S1?;6]U M;G0N:'PR,# R,3 Q-C R,S T-7PV-#4Q.7QC8F-A8SEF8C%B9C-E,C9D(&IA M<W!E<D!V<S$Y+FYE='QI;F-L=61E+VQI;G5X+VYF<S1?;6]U;G0N:'PR,# S M,#@P.3$Y,S8P,7PP.3 R-@H^('1O<G9A;&1S0&%T:&QO;BYT<F%N<VUE=&$N M8V]M?&9S+VYF<R]I;F]D92YC?#(P,#(P,C U,3<S.3,X?# Y,S8S?#-F,#,Y M,C=A8V9D8F0T82!J87-P97) =G,Q.2YN971\9G,O;F9S+VEN;V1E+F-\,C P M,S X,#DQ.3,V,#%\-C(X,#$*"CT]($)I=$ME97!E<B]E=&,O:6=N;W)E(#T] M"G1O<G9A;&1S0&%T:&QO;BYT<F%N<VUE=&$N8V]M?$)I=$ME97!E<B]E=&,O M:6=N;W)E?#(P,#(P,C U,3<S,#4V?#$W-S4Q?&9A-S%C-65D,S P83-C9F,* M=&]R=F%L9'- :&]M92YO<V1L+F]R9WQ":71+965P97(O971C+VEG;F]R97PR M,# S,#@P,C$W,S0U,7PU-C(R-PI$(#$N-C4@,#,O,#@O,#D@,C$Z,S8Z,#$K M,#(Z,# @:F%S<&5R0'9S,3DN;F5T("LS("TP"D(@=&]R=F%L9'- 871H;&]N M+G1R86YS;65T82YC;VU\0VAA;F=E4V5T?#(P,#(P,C U,3<S,#4V?#$V,#0W M?&,Q9#$Q830Q960P,C0X-C0*0PIC($%D9&5D(&9S+VYF<R]I;F]D92YC?B!I M;F-L=61E+VQI;G5X+VYF<S1?;6]U;G0N:'X@:6YC;'5D92]L:6YU>"]N9G-? M;6]U;G0N:'X@=&\@=&AE(&EG;F]R92!L:7-T"DL@-C,P-34*3R M<G<M<G<M M<BTM"E @0FET2V5E<&5R+V5T8R]I9VYO<F4*+2TM+2TM+2TM+2TM+2TM+2TM M+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM"@I),3,Y(#,*9G,O;F9S M+VEN;V1E+F-^"FEN8VQU9&4O;&EN=7@O;F9S-%]M;W5N="YH?@II;F-L=61E M+VQI;G5X+VYF<U]M;W5N="YH?@H*/3T@9G,O;F9S+VEN;V1E+F,@/3T*=&]R M=F%L9'- 871H;&]N+G1R86YS;65T82YC;VU\9G,O;F9S+VEN;V1E+F-\,C P M,C R,#4Q-S,Y,SA\,#DS-C-\,V8P,SDR-V%C9F1B9#1A"FIA<W!E<D!V<S$Y M+FYE=%MT;W)V86QD<UU\9G,O;F9S+VEN;V1E+F-\,C P,S W,3<Q.3$P,S9\
M-C,Y,#<*1" Q+C@U(# S+S X+S Y(#(Q.C,V.C Q*S R.C P(&IA<W!E<D!V M<S$Y+FYE=" K." M. I"('1O<G9A;&1S0&%T:&QO;BYT<F%N<VUE=&$N8V]M M?$-H86YG95-E='PR,# R,#(P-3$W,S U-GPQ-C T-WQC,60Q,6$T,65D,#(T M.#8T"D,*8R!#:&%N9V4@<W!E;&QI;F<@;V8@9FQA=F]U<B!T;R!F;&%V;W(@ M:6X@9G,O;F9S+VEN;V1E+F,*2R V,C@P,0I/("UR=RUR=RUR+2T*4"!F<R]N M9G,O:6YO9&4N8PHM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM M+2TM+2TM+2TM+2TM+2T*"D0T.#$@,0I)-#@Q(#$*"6EF("@A*&1A=&$M/F9L M86=S("8@3D937TU/54Y47U-%0T9,059/4BDI"D0Q,CDY(#$*23$R.3D@,0H) M"0ED871A+3YF;&%G<R F/2!^3D937TU/54Y47U-%0T9,059/4CL*1#$S-3<@ M,0I),3,U-R Q"@ER<&-?875T:&9L879O<E]T(&%U=&AF;&%V;W(["D0Q-#$P M(#,*23$T,3(@,PH)875T:&9L879O<B ](%)00U]!551(7U5.25@["@EI9B H M9&%T82T^875T:%]F;&%V;W)L96X@(3T@,"D@>PH)"6EF("AD871A+3YA=71H M7V9L879O<FQE;B ^(#$I"D0Q-#$T(#$*23$T,30@,0H)"6EF("AC;W!Y7V9R M;VU?=7-E<B@F875T:&9L879O<BP@9&%T82T^875T:%]F;&%V;W)S+"!S:7IE M;V8H875T:&9L879O<BDI*2!["D0Q-#(P(#$*23$T,C @,0H)"0D)('-E<G9E M<BT^<G!C7V]P<RT^=F5R<VEO;BP@875T:&9L879O<BD["@H]/2!I;F-L=61E M+VQI;G5X+VYF<U]M;W5N="YH(#T]"G1O<G9A;&1S0&%T:&QO;BYT<F%N<VUE M=&$N8V]M?&EN8VQU9&4O;&EN=7@O;F9S7VUO=6YT+FA\,C P,C R,#4Q-S,Y M-#!\,C8V,C!\-SED,3<Q-#1A,C=C-#%E90IF8W5S86-K0&9C=7-A8VLN8V]M M6W1O<G9A;&1S77QI;F-L=61E+VQI;G5X+VYF<U]M;W5N="YH?#(P,#,P-S$W
M,3<R.#$U?#8T-#(R"D0@,2XU(# S+S X+S Y(#(Q.C,V.C Q*S R.C P(&IA
M<W!E<D!V<S$Y+FYE=" K,2 M,0I"('1O<G9A;&1S0&%T:&QO;BYT<F%N<VUE
M=&$N8V]M?$-H86YG95-E='PR,# R,#(P-3$W,S U-GPQ-C T-WQC,60Q,6$T
M,65D,#(T.#8T"D,*8R!#:&%N9V4@<W!E;&QI;F<@;V8@9FQA=F]U<B!T;R!F
M;&%V;W(@:6X@9G,O;F9S+VEN;V1E+F,@86YD(&AE861E<G,*2R V-#,S-PI/
M("UR=RUR=RUR+2T*4"!I;F-L=61E+VQI;G5X+VYF<U]M;W5N="YH"BTM+2TM
M+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+0H*
M1#8P(#$*238P(#$*(V1E9FEN92!.1E-?34]53E1?4T5#1DQ!5D]2"3!X,C P
M, DO*B U("HO"@H]/2!I;F-L=61E+VQI;G5X+VYF<S1?;6]U;G0N:" ]/0IT
M<F]N9"YM>6ML96)U<W1 9GES+G5I;RYN;UMT;W)V86QD<UU\:6YC;'5D92]L
M:6YU>"]N9G,T7VUO=6YT+FA\,C P,C$P,38P,C,P-#5\-C0U,3E\8V)C86,Y
M9F(Q8F8S93(V9 IT<F]N9"YM>6ML96)U<W1 9GES+G5I;RYN;UMT;W)V86QD
M<UU\:6YC;'5D92]L:6YU>"]N9G,T7VUO=6YT+FA\,C P,C$P,38P,C,P-#9\
M,#DR-C *1" Q+C(@,#,O,#@O,#D@,C$Z,S8Z,#$K,#(Z,# @:F%S<&5R0'9S
M,3DN;F5T("LR("TR"D(@=&]R=F%L9'- 871H;&]N+G1R86YS;65T82YC;VU\
M0VAA;F=E4V5T?#(P,#(P,C U,3<S,#4V?#$V,#0W?&,Q9#$Q830Q960P,C0X
M-C0*0PIC($-H86YG92!S<&5L;&EN9R!O9B!F;&%V;W5R('1O(&9L879O<B!I
M;B!F<R]N9G,O:6YO9&4N8R!A;F0@:&5A9&5R<PI+(#DP,C8*3R M<G<M<G<M
M<BTM"E @:6YC;'5D92]L:6YU>"]N9G,T7VUO=6YT+F@*+2TM+2TM+2TM+2TM
M+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM"@I$-30@,@I)
M-34@,@H):6YT(&%U=&A?9FQA=F]R;&5N.PD)"2\J(#$@*B\*"6EN=" J875T
M:%]F;&%V;W)S.PD)"2\J(#$@*B\*"B,@4&%T8V@@8VAE8VMS=6T]9C@S,SDW
#,S0*Signature · 4 lines
Jasper Spaans http://jsp.vs19.net/contact/ <== Het bedrijf van de appelcomputer is niet ==> <== verantwoordelijk voor de omzettingsprecisie. ==>
Re: [PATCH] Fix up fs/nfs/inode.c wrt flavo[u]r
Quoted 13 lines · Jasper Spaans
Quoted 2 lines · Jasper Spaans
As I stated before, I'll whip up a patch. However, it's 2:45 localtime here right now, and I need to catch some sleep.
Here goes; this is the least intrusive version I could make which still makes sense.
fs/nfs/inode.c | 16 ++++++++-------- include/linux/nfs4_mount.h | 4 ++-- include/linux/nfs_mount.h | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-)
Quoted 5 lines
For those who want to look at this without using bitkeeper, a plaintext patch is available at
<whine> *sigh* why not just attach it inline into your email? </whine>
Quoted 3 lines
This BitKeeper patch contains the following changesets:
1.1150
## Wrapped with uu ##
uu *mumble*
Zwane
Re: [PATCH] Fix up fs/nfs/inode.c wrt flavo[u]r, try 2
In reply to Jasper SpaansWhoops, something went wrong here while exporting. Inline not wrapped etc bk patch follows, and if someone has seen my brown paper bag, please tell me. I think I lost it at friday's mud fight.
fs/nfs/inode.c | 18 +++++++++--------- include/linux/nfs4_mount.h | 4 ++-- include/linux/nfs_mount.h | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-)
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.1149 -> 1.1151
# include/linux/nfs_mount.h 1.4 -> 1.5
# include/linux/nfs4_mount.h 1.1 -> 1.2
# fs/nfs/inode.c 1.84 -> 1.86
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/08/09 [email protected] 1.1150
# Change spelling of flavour to flavor in fs/nfs/inode.c and the headers this file includes #
# This prevents any confusion that might arise because both spellings are used in the same source file. # --------------------------------------------
# 03/08/09 [email protected] 1.1151
# fs/nfs/inode.c cleanup: correct once more # -------------------------------------------- # diff -Nru a/fs/nfs/inode.c b/fs/nfs/inode.c --- a/fs/nfs/inode.c Sat Aug 9 23:34:27 2003 +++ b/fs/nfs/inode.c Sat Aug 9 23:34:27 2003 @@ -478,7 +478,7 @@ }
/* Fill in pseudoflavor for mount version < 5 */
- if (!(data->flags & NFS_MOUNT_SECFLAVOUR))
+ if (!(data->flags & NFS_MOUNT_SECFLAVOR))
data->pseudoflavor = RPC_AUTH_UNIX;
authflavor = data->pseudoflavor; /* save for sb_init() */
/* XXX maybe we want to add a server->pseudoflavor field */
@@ -1296,7 +1296,7 @@
memcpy(root->data, data->old_root.data, NFS2_FHSIZE);
}
if (data->version < 5)
- data->flags &= ~NFS_MOUNT_SECFLAVOUR;
+ data->flags &= ~NFS_MOUNT_SECFLAVOR;
}
if (root->size > sizeof(root->data)) {
@@ -1354,7 +1354,7 @@
struct rpc_xprt *xprt = NULL;
struct rpc_clnt *clnt = NULL;
struct rpc_timeout timeparms;
- rpc_authflavor_t authflavour;
+ rpc_authflavor_t authflavor;
int proto, err = -EIO;
sb->s_blocksize_bits = 0;
@@ -1407,17 +1407,17 @@
goto out_fail;
}
- authflavour = RPC_AUTH_UNIX;
- if (data->auth_flavourlen != 0) {
- if (data->auth_flavourlen > 1)
+ authflavor = RPC_AUTH_UNIX;
+ if (data->auth_flavorlen != 0) {
+ if (data->auth_flavorlen > 1)
printk(KERN_INFO "NFS: cannot yet deal with multiple auth flavours.\n");
- if (copy_from_user(&authflavour, data->auth_flavours, sizeof(authflavour))) {
+ if (copy_from_user(&authflavor, data->auth_flavors, sizeof(authflavor))) {
err = -EFAULT;
goto out_fail;
}
}
clnt = rpc_create_client(xprt, server->hostname, &nfs_program,
- server->rpc_ops->version, authflavour);
+ server->rpc_ops->version, authflavor);
if (clnt == NULL) {
printk(KERN_WARNING "NFS: cannot create RPC client.\n"); xprt_destroy(xprt);
@@ -1441,7 +1441,7 @@
if ((server->idmap = nfs_idmap_new(server)) == NULL)
printk(KERN_WARNING "NFS: couldn't start IDmap\n");
- err = nfs_sb_init(sb, authflavour);
+ err = nfs_sb_init(sb, authflavor);
if (err == 0)
return 0;
rpciod_down();
include/linux/nfs4_mount.h +2 -2
@@ -51,8 +51,8 @@int proto;/* 1 */ /* Pseudo-flavours to use for authentication. See RFC2623 */ -int auth_flavourlen;/* 1 */ -int *auth_flavours;/* 1 */ +int auth_flavorlen;/* 1 */ +int *auth_flavors;/* 1 */ };/* bits in the flags field */
include/linux/nfs_mount.h +1 -1
@@ -57,7 +57,7 @@#define NFS_MOUNT_NONLM 0x0200/* 3 */ #define NFS_MOUNT_BROKEN_SUID 0x0400/* 4 */ #define NFS_MOUNT_STRICTLOCK 0x1000/* reserved for NFSv4 */ -#define NFS_MOUNT_SECFLAVOUR 0x2000/* 5 */ +#define NFS_MOUNT_SECFLAVOR 0x2000/* 5 */ #define NFS_MOUNT_FLAGMASK 0xFFFF#endif
VrGr,
Signature · 1 line
Jasper Spaans http://jsp.vs19.net/contact/
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
" " == Linus Torvalds <[email protected]> writes:
> On 9 Aug 2003, Trond Myklebust wrote:
>>
>> Since we appear to be in the silly season...
> No, your patch isn't silly, it's EVIL. It fundamentally breaks > the notion of "grep for usage" by introducing two names to the > same thing, without having even a good reason (ie no "nice > abstraction" thing or anything).
Right! I fully agree that having 2 names for the same type is bad, although "find -type f | grep flavou?r" would be a quite adequate way of matching both spellings.
The point is, though, that I could have written
rpc_authflavor_t f;
and nobody would have cared or complained about grepability.
Anybody who claims that they have problems reading the code due to the difference between US and British spelling of the same variable is in reality engaged in a completely different type of crusade. One that doesn't deserve attention...
Cheers,
Trond
Quoted 11 lines · Linus Torvalds
Quoted 1 line · Trond Myklebust
Since we appear to be in the silly season...
No, your patch isn't silly, it's EVIL. It fundamentally breaks the notion of "grep for usage" by introducing two names to the same thing, without having even a good reason (ie no "nice abstraction" thing or anything).
So that's just bad.
In contrast, switching "authflavour" to "authflavor" (to match the type) ahs the advantage of _improving_ greppability.
... as long as you remember to misspell the word.
Signature · 1 line
Ian.
Quoted 23 lines · Timothy Miller
Quoted 10 lines · Jasper Spaans
Quoted 5 lines · Zwane Mwaikambo
Quoted 3 lines
It changes all occurrences of 'flavour' to 'flavor' in the complete tree; I've just comiled all affected files (that is, the config resulting from make allyesconfig minus already broken stuff) succesfully on i386.
Arrrgh! You can't be serious!
Quoted 8 lines
Yes, I am bloody serious; this patch might look purely cosmetic at first sight.. yet, there's a technical reason for at least one part of it. Grep and see the horror:
$ egrep -ni 'flavou?r' fs/nfs/inode.c [snip] 1357: rpc_authflavor_t authflavour; [snip]
Quoted 7 lines
Ah, for a moment, I was worried that someone was talking about text in comments.
Yes, when it comes to spelling of words in variable and type names, I think it would be a good idea to be consistent.
What is Linus's preferred spelling? Let's use that.
Or look at history. I picked the two samples easiest for
me: 2.4.18 and 2.2.10. In neither does fs/nfs/inode.c have "flavour" in comment or symbol. A search of the entire kernel tree shows "flavour" only appearing in comments in 2.2.10 but 2.4.18 has some variables and macros named "flavour" or "flavours" but they seem to be in the minority.
$ cd /usr/src/linux-2.4.18.SuSE $ find . -name '*.[ch]' | xargs grep -li 'flavour' |wc -l 18 $ find . -name '*.[ch]' | xargs grep -li 'flavor' |wc -l 36
Hardly scientific it lumps comments (which nobody should care about) with variables, functions and macros, and there will be an overlap between the two sets of files.
I'd say flavour has crept in. While i think that "flavour" has more panache than "flavor" i'd suggest regularising it in the way that makes the least change.
I'm also inclined to suggest that a preferred spelling be specified in the CodingStyle document. Inconsistency in this doesn't much affect readability but it does impact maintainability.
Signature · 5 lines
________________________________________________________________ J.W. Schultz Pegasystems Technologies email address: [email protected] Remember Cernan and Schmitt