Changeset d4d8255 in mainline for kernel/generic/include

Timestamp:

2016-03-09T20:01:43Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c1b8ad4

Parents:

df425da (diff), dc0e41c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~aurelio-x/helenos/kcon-devel

Location:

kernel/generic/include

Files:

• console/kconsole.h (modified) (3 diffs)
• str.h (modified) (1 diff)
• symtab.h (modified) (1 diff)

kernel/generic/include/console/kconsole.h

@@ -43 +43 @@
 #define KCONSOLE_HISTORY  10
 
+/** Callback to be used to enum hints for cmd tab completion. */
+typedef const char *(*hints_enum_func_t)(const char *, const char **, void **);
+
 typedef enum {
         ARG_TYPE_INVALID = 0,
@@ -85 +88 @@
         /** Function for printing detailed help. */
         void (* help)(void);
+        /** Function for enumerating hints for arguments. */
+        hints_enum_func_t hints_enum;
 } cmd_info_t;
 
@@ -100 +105 @@
 
 extern bool cmd_register(cmd_info_t *cmd);
+extern const char *cmdtab_enum(const char *name, const char **h, void **ctx);
 
 #endif

kernel/generic/include/str.h

@@ -62 +62 @@
 
 /**< Maximum size of a string containing cnt characters */
-#define STR_BOUNDS(cnt)  (cnt << 2)
+#define STR_BOUNDS(cnt)  ((cnt) << 2)
 
 extern wchar_t str_decode(const char *str, size_t *offset, size_t sz);

kernel/generic/include/symtab.h

@@ -40 +40 @@
 
 extern void symtab_print_search(const char *);
-extern int symtab_compl(char *, size_t, indev_t *);
+extern const char* symtab_hints_enum(const char *, const char **, void **);
 
 #endif