Skip to content

Commit

Permalink
Se agregan los datos del alumno De Leon, Lincoln
Browse files Browse the repository at this point in the history
  • Loading branch information
lincolndln committed Apr 12, 2021
1 parent ac74c8c commit 018fd53
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 0 deletions.
2 changes: 2 additions & 0 deletions inc/alumnos.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ bool GermanVelardez(char * cadena, size_t espacio);

bool JoseAlvarado(char * cadena, size_t espacio);

bool LincolnDeleon(char * cadena, size_t espacio);

/*=====[Prototypes (declarations) of public interrupt functions]=============*/

/*=====[C++ - end]===========================================================*/
Expand Down
11 changes: 11 additions & 0 deletions src/alumnos.c
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,17 @@ bool JoseAlvarado(char * cadena, size_t espacio) {
return SerializarAlumno(cadena, espacio, &alumno);
}

bool LincolnDeleon(char * cadena, size_t espacio) {
const struct alumno_s alumno = {
.apellidos = "DELEON",
.nombres = "Lincoln",
.documento = "23.517.968",
};

return SerializarAlumno(cadena, espacio, &alumno);
}


/*=====[Implementations of private functions]================================*/


Expand Down
7 changes: 7 additions & 0 deletions src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,5 +116,12 @@ int main(int argc, char *argv[]) {
printf("No se pudo serializar el alumno\r\n");
}

if LincolnDeleon(cadena, sizeof(cadena))) {
printf("Alumno: %s\r\n", cadena);
} else {
printf("No se pudo serializar el alumno\r\n");
}


return 0;
}

2 comments on commit 018fd53

@evolentini
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Los datos se debían agregar sobre una versión desactualizada del repositorio para que al momento de subirlos al servidor tuvieran un conflicto. Era requisito para aprobar esta parte del ejercicio resolver un conflicto. Para ello debes eliminar todas tus modificaciones con un commit, generar una nueva rama en cualquier commit anterior a este, hacer los cambios en esa rama y después integrarla en la rama master

@evolentini
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No tengo presentadas la segunda y tercera parte del este trabajo practico.

Please sign in to comment.