diff options
| author | Lou Berger <lberger@labn.net> | 2018-03-28 16:30:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-28 16:30:54 +0200 |
| commit | 615e608d76bd3e1acf1769c914142210ac88e3f7 (patch) | |
| tree | 1159398cc86aa18901a73480303fb52e09b1f9cc /vtysh | |
| parent | Merge pull request #1928 from pguibert6WIND/flowspec_get_vrf_from_rt (diff) | |
| parent | *: use C99 standard fixed-width integer types (diff) | |
| download | frr-615e608d76bd3e1acf1769c914142210ac88e3f7.tar.xz frr-615e608d76bd3e1acf1769c914142210ac88e3f7.zip | |
Merge pull request #1854 from qlyoung/integer-standards-compliance
*: use C99 standard fixed-width integer types
Diffstat (limited to 'vtysh')
| -rw-r--r-- | vtysh/vtysh.c | 16 | ||||
| -rw-r--r-- | vtysh/vtysh_config.c | 2 | ||||
| -rw-r--r-- | vtysh/vtysh_user.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index 1308e1218..96a5ea9e3 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -298,7 +298,7 @@ void vtysh_pager_init(void) static int vtysh_execute_func(const char *line, int pager) { int ret, cmd_stat; - u_int i; + unsigned int i; vector vline; const struct cmd_element *cmd; FILE *fp = NULL; @@ -683,7 +683,7 @@ int vtysh_mark_file(const char *filename) fprintf(stdout, "%s", vty->buf); break; case CMD_SUCCESS_DAEMON: { - u_int i; + unsigned int i; int cmd_stat = CMD_SUCCESS; fprintf(outputfile, "%s", vty->buf); @@ -760,7 +760,7 @@ int vtysh_config_from_file(struct vty *vty, FILE *fp) that */ break; case CMD_SUCCESS_DAEMON: { - u_int i; + unsigned int i; int cmd_stat = CMD_SUCCESS; for (i = 0; i < array_size(vtysh_client); i++) { @@ -2259,7 +2259,7 @@ DEFUN (vtysh_write_terminal, "For the isis daemon\n" "For the pim daemon\n") { - u_int i; + unsigned int i; char line[] = "do write terminal\n"; FILE *fp = outputfile; @@ -2353,7 +2353,7 @@ static void backup_config_file(const char *fbackup) int vtysh_write_config_integrated(void) { - u_int i; + unsigned int i; char line[] = "do write terminal\n"; FILE *fp; int fd; @@ -2461,7 +2461,7 @@ DEFUN (vtysh_write_memory, { int ret = CMD_SUCCESS; char line[] = "do write memory\n"; - u_int i; + unsigned int i; fprintf(outputfile, "Note: this version of vtysh never writes vtysh.conf\n"); @@ -2562,7 +2562,7 @@ DEFUN (vtysh_show_daemons, SHOW_STR "Show list of running daemons\n") { - u_int i; + unsigned int i; for (i = 0; i < array_size(vtysh_client); i++) if (vtysh_client[i].fd >= 0) @@ -2975,7 +2975,7 @@ static int vtysh_connect_all_instances(struct vtysh_client *head_client) int vtysh_connect_all(const char *daemon_name) { - u_int i; + unsigned int i; int rc = 0; int matches = 0; diff --git a/vtysh/vtysh_config.c b/vtysh/vtysh_config.c index e3431fac5..348053c72 100644 --- a/vtysh/vtysh_config.c +++ b/vtysh/vtysh_config.c @@ -44,7 +44,7 @@ struct config { struct config *config; /* Index of this config. */ - u_int32_t index; + uint32_t index; }; struct list *config_top; diff --git a/vtysh/vtysh_user.c b/vtysh/vtysh_user.c index 88af18d82..e575b7154 100644 --- a/vtysh/vtysh_user.c +++ b/vtysh/vtysh_user.c @@ -100,7 +100,7 @@ static int vtysh_pam(const char *user) struct vtysh_user { char *name; - u_char nopassword; + uint8_t nopassword; }; struct list *userlist; |