search for: optionnam

...tch fixes it. Not sure why this hasn't been caught before - i guess not many people use the ini plugin. Please apply. randolph diff --git a/plugins/ini.c b/plugins/ini.c index d58f671..2d3c2dd 100644 --- a/plugins/ini.c +++ b/plugins/ini.c @@ -377,7 +377,7 @@ iniParseLine (char *line, char **optionName, char **optionValue) if (*optionName) { strncpy (*optionName, line, length); - *optionName[length] = 0; + (*optionName)[length] = 0; } splitPos++; optionLength = strlen (splitPos); @@ -387,7 +387,7 @@ iniParseLine (char *line, char **optionName, char **...

...+}; - a->button.button = 0; - a->button.modifiers = 0; +enum { + ACTION_TYPE_KEY = 0, + ACTION_TYPE_BUTTON, + ACTION_TYPE_BELL, + ACTION_TYPE_EDGE, + ACTION_TYPE_EDGEBUTTON, + ACTION_TYPES_NUM +}; - a->bell = FALSE; +typedef struct _IniAction { + char *realOptionName; + unsigned int valueMasks; + CompAction a; +} IniAction; - a->edgeMask = 0; - a->edgeButton = 0; -} static IniFileData * iniGetFileDataFromFilename (CompDisplay *d, @@ -471,6 +493,135 @@ iniMakeDirectories (void) } static Bool +findActionType(char *optionName, int *typ...

...had a similar problem when I wrote a new pass and built it into opt. This error message is confusing because the code that prints it, in GetOptionInfo() in lib/Support/CommandLine.cpp: cerr << ProgramName << ": CommandLine Error: Argument '" << OptionNames[0] << "' defined more than once!\n"; should be printing OptionNames[i], not OptionNames[0]. (Once I had fixed this, it was easy to see what I had done wrong in the pass I wrote.) Jay.

I'm linking a program (my ellsif driver) that basically brings in most of the LLVM stuff: bitcode reading, optimizations, linking, and target code generation. All of a sudden, I'm getting the following when I run: [~/elsa/ellsif] dev% ./ellsif -v test/ofmt.i test/sieve.i -time-actions -O5 <premain>: CommandLine Error: Argument 'machine-licm' defined more than once!

...| 5 +- 15 files changed, 267 insertions(+), 245 deletions(-) diff --git a/builder/cmdline.ml b/builder/cmdline.ml index 846c2e3..49a57ee 100644 --- a/builder/cmdline.ml +++ b/builder/cmdline.ml @@ -20,6 +20,7 @@ open Common_gettext.Gettext open Common_utils +open Getopt.OptionName open Customize_cmdline @@ -119,46 +120,46 @@ let parse_cmdline () = let warn_if_partition = ref true in let argspec = [ - [ "--arch" ], Getopt.Set_string ("arch", arch), s_"Set the output architecture"; - [ "--attach" ], Getopt....

v3 -> v4: - Pushed the first patch upstream since it was ACKed. - Prevent use of M except for the special virt-v2v options. - Sort the options after added --help etc. - Make corresponding fixes to the tests. Rich.

v2 -> v3: - Add M variant and test it. Rich.

v1 -> v2: - Further fixes to Getopt int parsing. - Completed the L/S changes. - Fixed the test suite so it passes now. Also we don't need the special-case tests for 64 bit arch. Rich.

Hi Jay, > cerr << ProgramName << ": CommandLine Error: Argument '" > << OptionNames[0] << "' defined more than once!\n"; > > should be printing OptionNames[i], not OptionNames[0]. I committed this fix, http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20080526/063136.html Thanks! -------------- next part -------------- A non-text attachment...

...en I wrote a new pass and built it into > opt. This error message is confusing because the code that prints it, in > GetOptionInfo() in lib/Support/CommandLine.cpp: > > cerr << ProgramName << ": CommandLine Error: Argument '" > << OptionNames[0] << "' defined more than once!\n"; > > should be printing OptionNames[i], not OptionNames[0]. > > (Once I had fixed this, it was easy to see what I had done wrong in the pass > I wrote.) > > Jay. OK, I finally found my problem. (Which means I took the...

The second patch is obviously not complete yet - for discussion only. Rich.

This adds [f]getc() and fgets() for parsing config files. Probably hard to avoid. Still trying to decide if I actually want to add system() or not. -hpa

...461457b 100644 --- a/common/mltools/getopt.ml +++ b/common/mltools/getopt.ml @@ -31,6 +31,7 @@ type spec = | Int of string * (int -> unit) | Set_int of string * int ref | Symbol of string * string list * (string -> unit) + | OptString of string * (string option -> unit) module OptionName = struct type option_name = S of char | L of string | M of string @@ -97,7 +98,8 @@ let show_help h () = | Set_string (arg, _) | Int (arg, _) | Set_int (arg, _) - | Symbol (arg, _, _) -> Some arg in + | Symbol (arg, _, _) + | OptString (arg, _)...

...461457b 100644 --- a/common/mltools/getopt.ml +++ b/common/mltools/getopt.ml @@ -31,6 +31,7 @@ type spec = | Int of string * (int -> unit) | Set_int of string * int ref | Symbol of string * string list * (string -> unit) + | OptString of string * (string option -> unit) module OptionName = struct type option_name = S of char | L of string | M of string @@ -97,7 +98,8 @@ let show_help h () = | Set_string (arg, _) | Int (arg, _) | Set_int (arg, _) - | Symbol (arg, _, _) -> Some arg in + | Symbol (arg, _, _) + | OptString (arg, _)...

Miscellaneous refactoring, but the main one is to rename mllib/ as common/mltools/ Rich.

Doing this allows us to remove the Customize_utils module completely, since it becomes empty. Rich.

Hi, this is a first approach (hence RFC, since it misses tests & documentation) in selecting the output for --machine-readable. The possible choices are: * --machine-readable: to stdout, like before * --machine-readable=file:name-of-file: to the specified file * --machine-readable=stream:stdout: explicitly to stdout * --machine-readable=stream:stderr: explicitly to stderr This makes it

...f --git a/builder/cmdline.ml b/builder/cmdline.ml index f20c0936c..a1f901144 100644 --- a/builder/cmdline.ml +++ b/builder/cmdline.ml @@ -18,8 +18,9 @@ (* Command line argument parsing. *) -open Common_gettext.Gettext +open Std_utils open Common_utils +open Common_gettext.Gettext open Getopt.OptionName open Customize_cmdline diff --git a/builder/downloader.ml b/builder/downloader.ml index ef3cd67cb..d6b27c8c7 100644 --- a/builder/downloader.ml +++ b/builder/downloader.ml @@ -16,8 +16,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *) -open Common_gettext.Gettext +open...

...d I think that is the cause of the shutting down. There are parameters for "start" that aren't explained and not really obvious .... I just used the default (=demand)... anyone familiar with sc.exe? from http://support.microsoft.com/default.aspx?scid=kb;en-us;251192 about SC.exe optionname start= boot, system, auto, demand, disabled Start type for the service. Option values include types used by drivers. (default = demand) I'm thinking that demand might mean that the service runs when there's demand for it, so if all the players leave, it shuts down .... I'm guessing...

...et (gd->client, key5, gvalue, NULL); + + gconf_value_free (gvalue); + g_free (key1); g_free (key2); g_free (key3); g_free (key4); + g_free (key5); } break; case CompOptionTypeList: { GConfValueType type; @@ -455,11 +469,10 @@ gconfGetOptionValue (CompDisplay *d, } optionName = g_strdup (ptr); - o = compFindOption (option, nOption, optionName, 0); if (!o) { - static int tail[] = { 4, 5, 7 }; + static int tail[] = { 4, 5, 7, 12 }; int i = 0; while (i < sizeof (tail) / sizeof (tail[0]) && strlen (ptr) > tail[i]) @@ -575,6 +588,14 @@...