From: Parav Pandit <parav@nvidia.com>
To: <virtualization@lists.linux-foundation.org>,
<netdev@vger.kernel.org>, <dsahern@gmail.com>,
<stephen@networkplumber.org>, <mst@redhat.com>,
<jasowang@redhat.com>
Subject: [PATCH iproute2-next v4 2/5] utils: Add helper routines for indent handling
Date: Fri, 5 Feb 2021 20:10:26 +0200 [thread overview]
Message-ID: <20210205181029.365461-3-parav@nvidia.com> (raw)
In-Reply-To: <20210205181029.365461-1-parav@nvidia.com>
Subsequent patch needs to use 2 char indentation for nested objects.
Hence introduce a generic helpers to allocate, deallocate, increment,
decrement and to print indent block.
Signed-off-by: Parav Pandit <parav@nvidia.com>
---
changelog:
v2->v3:
- patch split from vdpa tool patch
---
include/utils.h | 16 ++++++++++++
lib/utils.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 82 insertions(+)
diff --git a/include/utils.h b/include/utils.h
index e66090ae..9b76c92a 100644
--- a/include/utils.h
+++ b/include/utils.h
@@ -349,4 +349,20 @@ int str_map_lookup_str(const struct str_num_map *map, const char *needle);
const char *str_map_lookup_u16(const struct str_num_map *map, uint16_t val);
const char *str_map_lookup_u8(const struct str_num_map *map, uint8_t val);
+unsigned int get_str_char_count(const char *str, int match);
+int str_split_by_char(char *str, char **before, char **after, int match);
+
+#define INDENT_STR_MAXLEN 32
+
+struct indent_mem {
+ int indent_level;
+ char indent_str[INDENT_STR_MAXLEN + 1];
+};
+
+struct indent_mem *alloc_indent_mem(void);
+void free_indent_mem(struct indent_mem *mem);
+void inc_indent(struct indent_mem *mem);
+void dec_indent(struct indent_mem *mem);
+void print_indent(struct indent_mem *mem);
+
#endif /* __UTILS_H__ */
diff --git a/lib/utils.c b/lib/utils.c
index af1b553c..cc6d0e34 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -1978,3 +1978,69 @@ const char *str_map_lookup_u8(const struct str_num_map *map, uint8_t val)
}
return NULL;
}
+
+unsigned int get_str_char_count(const char *str, int match)
+{
+ unsigned int count = 0;
+ const char *pos = str;
+
+ while ((pos = strchr(pos, match))) {
+ count++;
+ pos++;
+ }
+ return count;
+}
+
+int str_split_by_char(char *str, char **before, char **after, int match)
+{
+ char *slash;
+
+ slash = strrchr(str, match);
+ if (!slash)
+ return -EINVAL;
+ *slash = '\0';
+ *before = str;
+ *after = slash + 1;
+ return 0;
+}
+
+struct indent_mem *alloc_indent_mem(void)
+{
+ struct indent_mem *mem = malloc(sizeof(*mem));
+
+ if (!mem)
+ return NULL;
+ strcpy(mem->indent_str, "");
+ mem->indent_level = 0;
+ return mem;
+}
+
+void free_indent_mem(struct indent_mem *mem)
+{
+ free(mem);
+}
+
+#define INDENT_STR_STEP 2
+
+void inc_indent(struct indent_mem *mem)
+{
+ if (mem->indent_level + INDENT_STR_STEP > INDENT_STR_MAXLEN)
+ return;
+ mem->indent_level += INDENT_STR_STEP;
+ memset(mem->indent_str, ' ', sizeof(mem->indent_str));
+ mem->indent_str[mem->indent_level] = '\0';
+}
+
+void dec_indent(struct indent_mem *mem)
+{
+ if (mem->indent_level - INDENT_STR_STEP < 0)
+ return;
+ mem->indent_level -= INDENT_STR_STEP;
+ mem->indent_str[mem->indent_level] = '\0';
+}
+
+void print_indent(struct indent_mem *mem)
+{
+ if (mem->indent_level)
+ printf("%s", mem->indent_str);
+}
--
2.26.2
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
next prev parent reply other threads:[~2021-02-05 18:11 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-22 11:26 [PATCH iproute2-next 0/2] Add vdpa device management tool Parav Pandit
2021-01-22 11:26 ` [PATCH iproute2-next 1/2] Add kernel headers Parav Pandit
2021-01-22 11:26 ` [PATCH iproute2-next 2/2] vdpa: Add vdpa tool Parav Pandit
2021-01-26 4:22 ` David Ahern
2021-01-26 13:26 ` Parav Pandit
2021-01-28 18:43 ` [PATCH iproute2-next v2 0/2] Add vdpa device management tool Parav Pandit
2021-01-28 18:43 ` [PATCH iproute2-next v2 1/2] Add kernel headers Parav Pandit
2021-01-28 18:43 ` [PATCH iproute2-next v2 2/2] vdpa: Add vdpa tool Parav Pandit
2021-01-29 3:23 ` Parav Pandit
2021-02-02 10:35 ` [PATCH iproute2-next v3 0/5] Add vdpa device management tool Parav Pandit
2021-02-02 10:35 ` [PATCH iproute2-next v3 1/5] Add kernel headers Parav Pandit
2021-02-04 1:37 ` David Ahern
2021-02-05 17:54 ` Parav Pandit
2021-02-02 10:35 ` [PATCH iproute2-next v3 2/5] utils: Add helper routines for indent handling Parav Pandit
2021-02-02 10:35 ` [PATCH iproute2-next v3 3/5] utils: Add generic socket helpers Parav Pandit
2021-02-02 10:35 ` [PATCH iproute2-next v3 4/5] utils: Add helper to map string to unsigned int Parav Pandit
2021-02-02 10:35 ` [PATCH iproute2-next v3 5/5] vdpa: Add vdpa tool Parav Pandit
2021-02-04 3:16 ` [PATCH iproute2-next v3 0/5] Add vdpa device management tool Jason Wang
2021-02-04 11:15 ` Adrian Moreno
2021-02-05 3:40 ` Jason Wang
2021-02-05 17:53 ` Parav Pandit
2021-02-05 18:06 ` Adrian Moreno
2021-02-05 18:07 ` Adrian Moreno
2021-02-05 18:10 ` [PATCH iproute2-next v4 " Parav Pandit
2021-02-05 18:10 ` [PATCH iproute2-next v4 1/5] Add kernel headers Parav Pandit
2021-02-08 15:47 ` David Ahern
2021-02-10 18:28 ` Parav Pandit
2021-02-05 18:10 ` Parav Pandit [this message]
2021-02-05 18:10 ` [PATCH iproute2-next v4 3/5] utils: Add generic socket helpers Parav Pandit
2021-02-05 18:10 ` [PATCH iproute2-next v4 4/5] utils: Add helper to map string to unsigned int Parav Pandit
2021-02-05 18:10 ` [PATCH iproute2-next v4 5/5] vdpa: Add vdpa tool Parav Pandit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210205181029.365461-3-parav@nvidia.com \
--to=parav@nvidia.com \
--cc=dsahern@gmail.com \
--cc=jasowang@redhat.com \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.org \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).