Redblack: Added search_up

[libucw.git] / ucw / opt-test.c

diff --git a/ucw/opt-test.c b/ucw/opt-test.c
index a030eefea944c6d775ff618eae0e369a9e505d74..07fd6835f8c1ca7b1d5a69ed18c49744910feecf 100644 (file)
--- a/ucw/opt-test.c
+++ b/ucw/opt-test.c
@@ -50,6 +50,7 @@ static int with_gas = 0;
 static int *black_magic;
 static int pray = 0;
 static int water_amount = 0;
 static int *black_magic;
 static int pray = 0;
 static int water_amount = 0;

+static int clean_pot = 1;

 static char * first_tea = NULL;
 
 #define MAX_TEA_COUNT 30
 static char * first_tea = NULL;
 
 #define MAX_TEA_COUNT 30


@@ -99,7 +100,7 @@ static struct cf_user_type teapot_temperature_t = {
   .dumper = (cf_dumper1*) teapot_temperature_dumper
 };
 
   .dumper = (cf_dumper1*) teapot_temperature_dumper
 };
 

-static void opt_test_hook(struct opt_item * opt, uns event UNUSED, const char * value, void * data) {
+static void opt_test_hook(struct opt_item * opt, uint event UNUSED, const char * value, void * data) {

   if (!show_hooks)
     return;
   if (opt)
   if (!show_hooks)
     return;
   if (opt)


@@ -144,6 +145,7 @@ static struct opt_section options = {
     OPT_INC('q', "quiet", verbose, OPT_NEGATIVE, "\tQuiet (the more -q, the more quiet)"),
     OPT_INT_MULTIPLE('b', NULL, black_magic, 0, "<strength>\tUse black magic to make the tea extraordinarily delicious.\n\t\tMay be specified more than once to describe the amounts of black magic to be invoked in each step of tea boiling."),
     OPT_BOOL('p', "pray", pray, OPT_SINGLE, "\tPray before boiling"),
     OPT_INC('q', "quiet", verbose, OPT_NEGATIVE, "\tQuiet (the more -q, the more quiet)"),
     OPT_INT_MULTIPLE('b', NULL, black_magic, 0, "<strength>\tUse black magic to make the tea extraordinarily delicious.\n\t\tMay be specified more than once to describe the amounts of black magic to be invoked in each step of tea boiling."),
     OPT_BOOL('p', "pray", pray, OPT_SINGLE, "\tPray before boiling"),

+    OPT_BOOL(0, "no-clean", clean_pot, OPT_NEGATIVE, "\tDo not clean the teapot before boiling"),

     OPT_STRING(OPT_POSITIONAL(1), NULL, first_tea, OPT_REQUIRED, ""),
     OPT_CALL(OPT_POSITIONAL_TAIL, NULL, add_tea, &tea_list, 0, ""),
     OPT_HELP(""),
     OPT_STRING(OPT_POSITIONAL(1), NULL, first_tea, OPT_REQUIRED, ""),
     OPT_CALL(OPT_POSITIONAL_TAIL, NULL, add_tea, &tea_list, 0, ""),
     OPT_HELP(""),


@@ -178,10 +180,11 @@ int main(int argc UNUSED, char ** argv)
     printf("Chosen teapot: %s|", teapot_type_str[set]);
   printf("Temperature: %d%s|", temperature.value, temp_scale_str[temperature.scale]);
   printf("Verbosity: %d|", verbose);
     printf("Chosen teapot: %s|", teapot_type_str[set]);
   printf("Temperature: %d%s|", temperature.value, temp_scale_str[temperature.scale]);
   printf("Verbosity: %d|", verbose);

-  uns magick = GARY_SIZE(black_magic);
-  for (uns i=0; i<magick; i++)
+  uint magick = GARY_SIZE(black_magic);
+  for (uint i=0; i<magick; i++)

     printf("Black magic: %d|", black_magic[i]);
   printf("Prayer: %s|", pray ? "yes" : "no");
     printf("Black magic: %d|", black_magic[i]);
   printf("Prayer: %s|", pray ? "yes" : "no");

+  printf("Clean: %s|", clean_pot ? "yes" : "no");

   printf("Water amount: %d|", water_amount);
   printf("Gas: %s|", with_gas ? "yes" : "no");
   printf("First tea: %s|", first_tea);
   printf("Water amount: %d|", water_amount);
   printf("Gas: %s|", with_gas ? "yes" : "no");
   printf("First tea: %s|", first_tea);