Skip to content

Commit c260254

Browse files
author
Christopher Friedt
committed
Merge branch '2-redefinition-of-variable-i' into 'master'
used one definition of i Closes #2 See merge request pervices-open-source/server!12
1 parent 2910b5c commit c260254

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

server.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,16 @@ extern int verbose;
103103

104104
// main loop
105105
int main(int argc, char *argv[]) {
106+
107+
int ret = 0;
108+
int i = 0;
109+
cmd_t cmd;
110+
106111
verbose = 0;
107112
fd_set rfds;
108113

109114
// check for firmware version
110-
for( int i = 1; i < argc; i++ ) {
115+
for( i = 1; i < argc; i++ ) {
111116
if (strcmp(argv[i], "-v") == 0) {
112117
printf("Branch: %s\n", VERSIONGITBRANCH);
113118
printf("Revision: %s\n", VERSIONGITREVISION);
@@ -127,10 +132,6 @@ int main(int argc, char *argv[]) {
127132
}
128133
}
129134

130-
int ret = 0;
131-
int i = 0;
132-
cmd_t cmd;
133-
134135
PRINT( INFO, "Starting Crimson server\n");
135136

136137
server_init_led();

0 commit comments

Comments
 (0)