diff --git a/.cproject b/.cproject new file mode 100644 index 0000000..b2b8c1c --- /dev/null +++ b/.cproject @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + make + + all + true + false + true + + + make + + clean + true + false + true + + + + diff --git a/.gitignore b/.gitignore index bd31a53..22111c8 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ *.o *.a -.cproject -.project .settings/language.settings.xml +test_multiaddr diff --git a/.project b/.project new file mode 100644 index 0000000..3791770 --- /dev/null +++ b/.project @@ -0,0 +1,26 @@ + + + c-multiaddr + + + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + org.eclipse.cdt.core.cnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + diff --git a/Makefile b/Makefile index c872899..1677f21 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ ifdef DEBUG CFLAGS += -g3 endif -LFLAGS = -lmultiaddr +LFLAGS = -lm DEPS = include/multiaddr/base58.h include/multiaddr/endian.h include/multiaddr/multiaddr.h \ include/multiaddr/protocols.h include/multiaddr/protoutils.h include/multiaddr/varhexutils.h \ include/multiaddr/varint.h @@ -17,7 +17,7 @@ OBJS = base58.o varint.o libmultiaddr.a: $(OBJS) ar rcs $@ $^ -test_multiaddr: libmultiaddr.a testing.o +test_multiaddr: testing.o libmultiaddr.a $(CC) -o $@ $^ $(LFLAGS) all: test_multiaddr diff --git a/include/multiaddr/multiaddr.h b/include/multiaddr/multiaddr.h index 3380194..f902ffc 100644 --- a/include/multiaddr/multiaddr.h +++ b/include/multiaddr/multiaddr.h @@ -1,7 +1,7 @@ #ifndef MULTIADDR #define MULTIADDR #include "varhexutils.h" -#include "codecs.h" +//#include "codecs.h" #include "varint.h" #include "protocols.h" #include "protoutils.h" @@ -35,6 +35,7 @@ struct maddr new_maddr_fb(uint8_t * byteaddress,int size)//Construct new address return anewaddr2; } } + return anewaddr2; } struct maddr new_maddr_fs(char * straddress)//Construct new address from string { @@ -52,6 +53,7 @@ struct maddr new_maddr_fs(char * straddress)//Construct new address from string } return anewaddr; } + return anewaddr; } int m_encapsulate(struct maddr * result, char * string) { @@ -123,4 +125,4 @@ int m_decapsulate(struct maddr * result, char * srci) } } -#endif \ No newline at end of file +#endif