Skip to content

Commit

Permalink
solucionado el problema?
Browse files Browse the repository at this point in the history
  • Loading branch information
@Germanvelardez2018
Germanvelardez2018 committed Apr 10, 2021
2 parents 5905dca + 73d5252 commit 7c1e544
Show file tree
Hide file tree
Showing 5 changed files with 157 additions and 27 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
build
/.vscode
16 changes: 0 additions & 16 deletions .vscode/c_cpp_properties.json
View file

This file was deleted.

18 changes: 17 additions & 1 deletion inc/alumnos.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,23 @@ typedef struct alumno_s {
} const * alumno_t;

/*=====[Definitions of public global variables]==============================*/

char cadena[100];
/*=====[Prototypes (declarations) of public functions]=======================*/

bool SerializarAlumno(char * cadena, size_t espacio, const alumno_t alumno);

bool AlejandroRougier(char * cadena, size_t espacio);

bool RodriguezOsvaldo(char * cadena, size_t espacio);

bool IvanVargasMarza(char * cadena, size_t espacio);

bool NicolasVargas(char * cadena, size_t espacio);

bool FedericoMeghinasso(char * cadena, size_t espacio);

bool MatiasMeghinasso(char * cadena, size_t espacio);

bool MartinDuarte(char * cadena, size_t espacio);

bool AlejandroPermingeat(char * cadena, size_t espacio);
Expand All @@ -49,7 +61,11 @@ bool EstebanVolentini(char * cadena, size_t espacio);

bool LucasOrsi(char * cadena, size_t espacio);

<<<<<<< HEAD
bool GermanVelardez(char * cadena, size_t espacio);
=======
bool JoseAlvarado(char * cadena, size_t espacio);
>>>>>>> 73d525274ee31f953a502521fdc39bae3135dd71

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

Expand Down
92 changes: 84 additions & 8 deletions src/alumnos.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Version: 0.1.0
* Creation Date: 2019/06/21
*/

/*=====[Inclusion of own header]=============================================*/

#include "alumnos.h"
Expand All @@ -32,20 +32,72 @@

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

bool SerializarAlumno(char * cadena, size_t espacio, const alumno_t alumno) {
bool SerializarAlumno(char *cadena, size_t espacio, const alumno_t alumno)
{
int resultado;
const char FORMATO[] = "{"
"\"documento\":\"%s\","
"\"apellidos\":\"%s\","
"\"nombres\":\"%s\""
"}";
"\"documento\":\"%s\","
"\"apellidos\":\"%s\","
"\"nombres\":\"%s\""
"}";

resultado = snprintf(cadena, espacio, FORMATO,
alumno->documento, alumno->apellidos, alumno->nombres);
resultado = snprintf(cadena, espacio, FORMATO,
alumno->documento, alumno->apellidos, alumno->nombres);

return (resultado >= 0);
}

bool IvanVargasMarza(char * cadena, size_t espacio) {
const struct alumno_s alumno = {
.apellidos = "VARGAS",
.nombres = "Ivan",
.documento = "38.170.436",
};

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

bool RodriguezOsvaldo(char * cadena, size_t espacio) {
const struct alumno_s alumno = {
.apellidos = "RODRIGUEZ",
.nombres = "Osvaldo Antonio",
.documento = "15.123.345",
};

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

bool NicolasVargas(char * cadena, size_t espacio) {
const struct alumno_s alumno = {
.apellidos = "VARGAS",
.nombres = "Nicolás",
.documento = "33.154.750",
};

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

bool FedericoMeghinasso(char * cadena, size_t espacio) {
const struct alumno_s alumno = {
.apellidos = "MEGHINASSO",
.nombres = "Federico Nicolas",
.documento = "35.229.281",
};

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

bool MatiasMeghinasso(char *cadena, size_t espacio)
{
const struct alumno_s alumno = {
.apellidos = "Matias",
.nombres = "Matias Gino",
.documento = "36.806.968",
};

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

bool MartinDuarte(char * cadena, size_t espacio) {
const struct alumno_s alumno = {
.apellidos = "DUARTE",
Expand All @@ -56,6 +108,16 @@ bool MartinDuarte(char * cadena, size_t espacio) {
return SerializarAlumno(cadena, espacio, &alumno);
}

bool AlejandroRougier(char * cadena, size_t espacio) {
const struct alumno_s alumno = {
.apellidos = "ROUGIER",
.nombres = "Omar Alejandro",
.documento = "22.661.059",
};

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

bool AlejandroPermingeat(char * cadena, size_t espacio) {
const struct alumno_s alumno = {
.apellidos = "PERMINGEAT",
Expand Down Expand Up @@ -85,6 +147,7 @@ bool LucasOrsi(char * cadena, size_t espacio) {
return SerializarAlumno(cadena, espacio, &alumno);
}


bool GermanVelardez(char * cadena, size_t espacio){
const struct alumno_s alumno = {
.apellidos = "Velardez",
Expand All @@ -94,6 +157,17 @@ bool GermanVelardez(char * cadena, size_t espacio){
return SerializarAlumno(cadena, espacio, &alumno);
}

bool JoseAlvarado(char * cadena, size_t espacio) {
const struct alumno_s alumno = {
.apellidos = "Alvarado",
.nombres = "Jose David",
.documento = "81.740.023",
};
return SerializarAlumno(cadena, espacio, &alumno);
}

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


bool JosueElias(char * cadena, size_t espacio) {
const struct alumno_s alumno = {
Expand All @@ -104,6 +178,8 @@ bool JosueElias(char * cadena, size_t espacio) {
return SerializarAlumno(cadena, espacio, &alumno);
}


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


/*=====[Implementations of private functions]================================*/
57 changes: 55 additions & 2 deletions src/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@
* Version: 0.1.0
* Creation Date: 2019/06/21
*/

/*=====[Inclusion of own header]=============================================*/





#include "alumnos.h"
#include <stdio.h>

Expand All @@ -34,10 +38,30 @@

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



int main(int argc, char *argv[]) {
char cadena[128];

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

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

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

if (NicolasVargas(cadena, sizeof(cadena))) {
printf("Alumno: %s\r\n", cadena);
} else {
printf("No se pudo serializar el alumno\r\n");
Expand Down Expand Up @@ -67,7 +91,26 @@ int main(int argc, char *argv[]) {
} else {
printf("No se pudo serializar el alumno\r\n");
}

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

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

<<<<<<< HEAD
if (GermanVelardez(cadena, sizeof(cadena))) {
printf("Alumno: %s\r\n", cadena);
} else {
Expand All @@ -88,6 +131,16 @@ int main(int argc, char *argv[]) {
printf("No se pudo serializar el alumno\r\n");
}

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

return 0;
}

1 comment on commit 7c1e544

@evolentini
Copy link
Contributor

@evolentini evolentini commented on 7c1e544 Apr 28, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Como podes notar en esta pagina lejos de solucionar el problema en este commit generaste un problema mayor. Ademas de modificar archivos que no hacía falta no resolviste los conflictos, por eso aparecen marcas como estas en los archivos

<<<<<<< HEAD
=======
>>>>>>> 73d525274ee31f953a502521fdc39bae3135dd71

Esos conflictos los resolvió Jose Alvarado en un commit posterior

Please sign in to comment.